Try to avoid reserved site keyword

[mirror/dsa-puppet.git] / modules / named / manifests / primary.pp

diff --git a/modules/named/manifests/primary.pp b/modules/named/manifests/primary.pp
index 75d50d2..40cd6d1 100644 (file)
--- a/modules/named/manifests/primary.pp
+++ b/modules/named/manifests/primary.pp
@@ -1,7 +1,7 @@
 class named::primary inherits named::authoritative {
        include dnsextras::entries
 
-       @ferm::rule { '01-dsa-bind-4':
+       ferm::rule { '01-dsa-bind-4':
                domain      => '(ip ip6)',
                description => 'Allow nameserver access',
                rule        => '&TCP_UDP_SERVICE_RANGE(53, ( $HOST_DNS_GEO $HOST_NAGIOS $HOST_RCODE0 $HOST_EASYDNS $HOST_NETNOD ) )',
@@ -31,7 +31,7 @@ class named::primary inherits named::authoritative {
                                file "db._openpgpkey.debian.org";
                                allow-query { any; };
                                masters {
-                                       ${ join(getfromhash($site::allnodeinfo, 'kaufmann.debian.org', 'ipHostNumber'), ";") } ;
+                                       ${ join(getfromhash($deprecated::allnodeinfo, 'kaufmann.debian.org', 'ipHostNumber'), ";") } ;
                                };
                                allow-transfer {
                                        127.0.0.1;
@@ -40,6 +40,9 @@ class named::primary inherits named::authoritative {
                                        dnsnodeapi-ACL;
                                };
                                also-notify {
+                                       rcode0-masters;
+                                       dnsnode-masters;
+                                       dnsnodeapi-masters;
                                };
 
                                key-directory "/srv/dns.debian.org/var/keys/_openpgpkey.debian.org";
@@ -49,4 +52,16 @@ class named::primary inherits named::authoritative {
                        };
                        | EOF
        }
+
+       concat::fragment { 'dsa-puppet-stuff--nsec3':
+               target => '/etc/cron.d/dsa-puppet-stuff',
+               content  => @(EOF)
+                       13 19 4 * * root chronic /usr/sbin/rndc signing -nsec3param 1 0 16 $(head -c 20 /dev/urandom | sha512sum | cut -b 1-10) debian.net
+                       29 12 7 * * root chronic /usr/sbin/rndc signing -nsec3param 1 0 16 $(head -c 20 /dev/urandom | sha512sum | cut -b 1-10) debian.org
+                       32 12 7 * * root chronic /usr/sbin/rndc signing -nsec3param 1 0 16 $(head -c 20 /dev/urandom | sha512sum | cut -b 1-10) debconf.org
+                       36 12 7 * * root chronic /usr/sbin/rndc signing -nsec3param 1 0 16 $(head -c 20 /dev/urandom | sha512sum | cut -b 1-10) _openpgpkey.debian.org
+
+                       | EOF
+       }
+
 }