X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Fmanifests%2Fgeodns.pp;h=ef2fa14ccb31b353f586a0aa3674a8be30bc9b3b;hb=2835c1daf1a5f55ec56366fa5d534b6bfc7728cb;hp=d9684f3dbc07509640148d4592dcc5bbf5631c3f;hpb=e34d8e0cd1246d068196493701922e4e1645b9e6;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp
index d9684f3db..ef2fa14cc 100644
--- a/modules/named/manifests/geodns.pp
+++ b/modules/named/manifests/geodns.pp
@@ -47,20 +47,15 @@ class named::geodns inherits named {
 		mode   => '0555',
 		source => 'puppet:///modules/named/common/trigger',
 	}
-	file { '/etc/ssh/userkeys/geodnssync':
-		source => 'puppet:///modules/named/common/authorized_keys',
-		group  => geodnssync,
-		mode   => '0440',
-	}
 	file { '/etc/cron.d/dsa-boot-geodnssync': ensure => absent; }
-	concat::fragment { 'dsa-puppet-stuff--geodns-boot':
-		target => '/etc/cron.d/dsa-puppet-stuff',
+	concat::fragment { 'puppet-crontab--geodns-boot':
+		target => '/etc/cron.d/puppet-crontab',
 		content  => @(EOF)
 			@reboot geodnssync sleep 1m && /etc/bind/geodns/trigger > /dev/null
 			| EOF
 	}
 
-	@ferm::rule { '01-dsa-bind':
+	ferm::rule { '01-dsa-bind':
 		domain      => '(ip ip6)',
 		description => 'Allow nameserver access',
 		rule        => '&TCP_UDP_SERVICE(53)'