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

diff --git a/modules/roles/manifests/keyring.pp b/modules/roles/manifests/keyring.pp
index 910b6669b..a411ff540 100644
--- a/modules/roles/manifests/keyring.pp
+++ b/modules/roles/manifests/keyring.pp
@@ -12,9 +12,9 @@ class roles::keyring {
 
 	include named::authoritative
 
-	$notify_address_bind = join(getfromhash($site::allnodeinfo, 'denis.debian.org', 'ipHostNumber'), "; ")
+	$notify_address_bind = join(getfromhash($deprecated::allnodeinfo, 'denis.debian.org', 'ipHostNumber'), "; ")
 
-	@ferm::rule { '01-dsa-bind':
+	ferm::rule { '01-dsa-bind':
 		domain      => '(ip ip6)',
 		description => 'Allow nameserver access',
 		rule        => '&TCP_UDP_SERVICE_RANGE(53, ( $HOST_NAGIOS $HOST_DNSPRIMARY ) )',
@@ -24,7 +24,6 @@ class roles::keyring {
 		target => '/etc/bind/named.conf.puppet-misc',
 		order  => '020',
 		content  => @("EOF"),
-			// MAINTAIN-KEY: _openpgpkey.debian.org
 			zone "_openpgpkey.debian.org" {
 				type master;
 				file "/srv/keyring.debian.org/_openpgpkey.debian.org.zone";