X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fnamed%2Fmanifests%2Fprimary.pp;h=88d4f0f057c3d5d0c461119426169167db4edc66;hb=2835c1daf1a5f55ec56366fa5d534b6bfc7728cb;hp=5ea94db03b741a039d1d8570eec56671478fd6ad;hpb=1ca3dc8279c61474aea44adfa2e3b91ca4279a02;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/manifests/primary.pp b/modules/named/manifests/primary.pp
index 5ea94db03..88d4f0f05 100644
--- 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;
@@ -53,8 +53,8 @@ class named::primary inherits named::authoritative {
 			| EOF
 	}
 
-	concat::fragment { 'dsa-puppet-stuff--nsec3':
-		target => '/etc/cron.d/dsa-puppet-stuff',
+	concat::fragment { 'puppet-crontab--nsec3':
+		target => '/etc/cron.d/puppet-crontab',
 		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