Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

diff --git a/manifests/site.pp b/manifests/site.pp
index 5ffb7a9..33b1149 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -70,7 +70,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 a7874dd..72fe162 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 b9615a6..003f1fe 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"],
+    }
 }