X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fkeyring.pp;h=a411ff5402f43d2f7377c2857a8f874c3e55fd51;hb=d0c098685b92334a611a0c596a35f538b95ead47;hp=f6935e18047c1e46a253bfbe683ed1c20f4df576;hpb=46efb1d7284108553bc312019338f574a940030e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/keyring.pp b/modules/roles/manifests/keyring.pp
index f6935e180..a411ff540 100644
--- a/modules/roles/manifests/keyring.pp
+++ b/modules/roles/manifests/keyring.pp
@@ -9,4 +9,34 @@ class roles::keyring {
 		key      => true,
 		tlsaport => [443, 1873],
 	}
+
+	include named::authoritative
+
+	$notify_address_bind = join(getfromhash($deprecated::allnodeinfo, 'denis.debian.org', 'ipHostNumber'), "; ")
+
+	ferm::rule { '01-dsa-bind':
+		domain      => '(ip ip6)',
+		description => 'Allow nameserver access',
+		rule        => '&TCP_UDP_SERVICE_RANGE(53, ( $HOST_NAGIOS $HOST_DNSPRIMARY ) )',
+	}
+
+	concat::fragment { 'dsa-named-conf-puppet-misc---openpgpkey-zone':
+		target => '/etc/bind/named.conf.puppet-misc',
+		order  => '020',
+		content  => @("EOF"),
+			zone "_openpgpkey.debian.org" {
+				type master;
+				file "/srv/keyring.debian.org/_openpgpkey.debian.org.zone";
+				allow-query { any; };
+				allow-transfer {
+					key tsig-denis.debian.org-kaufmann.debian.org ;
+					127.0.0.1;
+				};
+				also-notify {
+					$notify_address_bind;
+				};
+			};
+			| EOF
+	}
+
 }