enable named secondary module

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

diff --git a/manifests/site.pp b/manifests/site.pp
index d5b6ab6c8493b8c42fd7b9dc7b6cdf35979beb4d..89096a0a92b04df1eacb731a23ff32341171afd5 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -67,7 +67,6 @@ node default {
          "true":  { include buildd }
     }
 
-# maybe wait for rietz to be upgraded to lenny
     case $hostname {
         rietz,raff,klecker: { include named::secondary }
     }

diff --git a/modules/named/files/common/named.conf.debian-zones b/modules/named/files/common/named.conf.debian-zones
index a7874dd33c75e2b8d2c8debc01c234c6e1d13681..72fe16267a6a77410456b0d090c22bfb3fcfead0 100644 (file)
--- a/modules/named/files/common/named.conf.debian-zones
+++ b/modules/named/files/common/named.conf.debian-zones
@@ -5,8 +5,6 @@
 
 // Slave domains, includ in bind.conf
 
-// NOT USED YET - SYNC UP WITH dsa-misc/config/bind/ before enabling finally
-
 zone "debian.org" {
        type slave;
        notify no;

diff --git a/modules/named/manifests/secondary.pp b/modules/named/manifests/secondary.pp
index b9615a627a9abb494d0f508815eee03ed3499028..003f1fe4fac952f0efb64d9f951c8de13fa7e697 100644 (file)
--- a/modules/named/manifests/secondary.pp
+++ b/modules/named/manifests/secondary.pp
@@ -1,8 +1,8 @@
 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"],
+    }
 }