X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Fmanifests%2Fprimary.pp;h=5ea94db03b741a039d1d8570eec56671478fd6ad;hb=a460997ef6acddc28b6342a2ff615f17ba0b8b2b;hp=630bccee31bda78eab652211905ecd11bc676177;hpb=6d81dd48900c51ee22240d53e66e990fa5e186a7;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/manifests/primary.pp b/modules/named/manifests/primary.pp
index 630bccee3..5ea94db03 100644
--- a/modules/named/manifests/primary.pp
+++ b/modules/named/manifests/primary.pp
@@ -7,22 +7,61 @@ class named::primary inherits named::authoritative {
 		rule        => '&TCP_UDP_SERVICE_RANGE(53, ( $HOST_DNS_GEO $HOST_NAGIOS $HOST_RCODE0 $HOST_EASYDNS $HOST_NETNOD ) )',
 	}
 
-	file { '/etc/bind/named.conf.debian-zones':
-		content => template('named/named.conf.debian-zones.erb'),
-		notify  => Service['bind9'],
+	concat::fragment { 'dsa-named-conf-puppet-misc---local-shared-keys':
+		target => '/etc/bind/named.conf.puppet-misc',
+		order  => '020',
+		content  => @(EOF),
+			include "/etc/bind/named.conf.shared-keys";
+			| EOF
 	}
-
 	concat::fragment { 'dsa-named-conf-puppet-misc---named.conf.external-secondaries-ACLs':
 		target => '/etc/bind/named.conf.puppet-misc',
-		order  => '010',
+		order  => '025',
 		content => template('named/named.conf.external-secondaries-ACLs.erb'),
 	}
 
-	concat::fragment { 'dsa-named-conf-puppet-misc---local-shared-keys':
+	concat::fragment { 'dsa-named-conf-puppet-misc---openpgpkey-zone':
 		target => '/etc/bind/named.conf.puppet-misc',
-		order  => '011',
-		content  => @(EOF),
-			include "/etc/bind/named.conf.shared-keys";
+		order  => '020',
+		content  => @("EOF"/$)
+			// MAINTAIN-KEY: _openpgpkey.debian.org
+
+			zone "_openpgpkey.debian.org" {
+				type slave;
+				file "db._openpgpkey.debian.org";
+				allow-query { any; };
+				masters {
+					${ join(getfromhash($site::allnodeinfo, 'kaufmann.debian.org', 'ipHostNumber'), ";") } ;
+				};
+				allow-transfer {
+					127.0.0.1;
+					rcode0-ACL;
+					dnsnode-ACL;
+					dnsnodeapi-ACL;
+				};
+				also-notify {
+					rcode0-masters;
+					dnsnode-masters;
+					dnsnodeapi-masters;
+				};
+
+				key-directory "/srv/dns.debian.org/var/keys/_openpgpkey.debian.org";
+				sig-validity-interval 40 25;
+				auto-dnssec maintain;
+				inline-signing yes;
+			};
+			| 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
 	}
+
 }