reshuffle where template is served from

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp
index 098b112c1cbb65dd17148c27301e8a1c01c7ba87..34ec1cd8ca65a07a5e765d38dd1156f0f05c7abc 100644 (file)
--- a/modules/named/manifests/geodns.pp
+++ b/modules/named/manifests/geodns.pp
@@ -4,6 +4,9 @@ class named::geodns inherits named {
     }
 
     file {
+        "/etc/bind/named.conf.options":
+            content => template("named/named.conf.options.erb"),
+            notify  => Exec["bind9 reload"];
         "/etc/apt/sources.list.d/geoip.list":
             content => template("debian-org/etc/apt/sources.list.d/geoip.list.erb"),
             notify  => Exec["apt-get update"],

diff --git a/modules/named/manifests/init.pp b/modules/named/manifests/init.pp
index 050fb7533c5ac69f5cc67fc09eb02285922f40a6..8cfa4080c24542bc8a690a1cd7604dcc53e4e8e8 100644 (file)
--- a/modules/named/manifests/init.pp
+++ b/modules/named/manifests/init.pp
@@ -24,9 +24,6 @@ class named {
             group   => bind,
             mode    => 775,
             ;
-        "/etc/bind/named.conf.options":
-            content => template("named/named.conf.options.erb"),
-            notify  => Exec["bind9 reload"],
     }
     @ferm::rule { "dsa-bind":
         domain          => "(ip ip6)",

diff --git a/modules/named/manifests/recursor.pp b/modules/named/manifests/recursor.pp
index fda2de30d3eef71591c2443cd6021e58747d6d12..66227c4b587d149f1f9e3941bddb86b59cfb7a63 100644 (file)
--- a/modules/named/manifests/recursor.pp
+++ b/modules/named/manifests/recursor.pp
@@ -1,4 +1,9 @@
 class named::recursor inherits named {
+    file {
+        "/etc/bind/named.conf.options":
+            content => template("named/named.conf.options.erb"),
+            notify  => Exec["bind9 reload"];
+    }
 }
 
 

diff --git a/modules/named/manifests/secondary.pp b/modules/named/manifests/secondary.pp
index 4f92c5b75b0ab298206b96608f9df60dbf72552e..b08685259d64beed2dacc162ec631674885a7278 100644 (file)
--- a/modules/named/manifests/secondary.pp
+++ b/modules/named/manifests/secondary.pp
@@ -1,8 +1,12 @@
 class named::secondary inherits named {
-    file { "/etc/bind/named.conf.debian-zones":
-        source  => [ "puppet:///named/per-host/$fqdn/named.conf.debian-zones",
-                     "puppet:///named/common/named.conf.debian-zones" ],
-        notify  => Exec["bind9 reload"],
+    file {
+        "/etc/bind/named.conf.debian-zones":
+            source  => [ "puppet:///named/per-host/$fqdn/named.conf.debian-zones",
+                         "puppet:///named/common/named.conf.debian-zones" ],
+            notify  => Exec["bind9 reload"];
+        "/etc/bind/named.conf.options":
+            content => template("named/named.conf.options.erb"),
+            notify  => Exec["bind9 reload"];
     }
     file { "/etc/bind/named.conf.shared-keys":
         mode    => 640,