X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpuppetmaster%2Fmanifests%2Finit.pp;h=9fed0247b39a9a82ade76f2309ec0a4a64089079;hb=3c9536406517ab5f0a46172e323b199acff2c61c;hp=08b400f5172771d6613976aec6325ab8cdced427;hpb=aba2dd60d755b8d73ef2ab1a2d35a378335ecd90;p=mirror%2Fdsa-puppet.git

diff --git a/modules/puppetmaster/manifests/init.pp b/modules/puppetmaster/manifests/init.pp
index 08b400f51..9fed0247b 100644
--- a/modules/puppetmaster/manifests/init.pp
+++ b/modules/puppetmaster/manifests/init.pp
@@ -10,14 +10,10 @@ class puppetmaster {
 		source => 'puppet:///modules/puppetmaster/puppetdb.conf'
 	}
 
-	@ferm::rule { 'dsa-puppet':
+	ferm::rule { 'dsa-puppet':
 		description     => 'Allow puppet access',
-		rule            => '&SERVICE_RANGE(tcp, 8140, $HOST_DEBIAN_V4)'
-	}
-	@ferm::rule { 'dsa-puppet-v6':
-		domain          => 'ip6',
-		description     => 'Allow puppet access',
-		rule            => '&SERVICE_RANGE(tcp, 8140, $HOST_DEBIAN_V6)'
+		domain          => '(ip ip6)',
+		rule            => '&SERVICE_RANGE(tcp, 8140, $HOST_DEBIAN)',
 	}
 
 	file { '/srv/puppet.debian.org/puppet-facts':
@@ -27,11 +23,13 @@ class puppetmaster {
 	}
 	Concat::Fragment <<| tag == "onionbalance-services.yaml" |>>
 
-	file { '/etc/cron.d/puppet-update-fastly-ips':
-		source => 'puppet:///modules/puppetmaster/update-fastly-ips.cron'
-	}
-	file { '/etc/cron.d/update-fastly-ips':
-		ensure => absent,
+	file { '/etc/cron.d/puppet-update-fastly-ips': ensure => absent, }
+	file { '/etc/cron.d/update-fastly-ips': ensure => absent, }
+	concat::fragment { 'puppet-crontab---fastly-ips':
+		target => '/etc/cron.d/puppet-crontab',
+		content  => @(EOF)
+			@daily	root	/usr/local/bin/update-fastly-ips /srv/puppet.debian.org/puppet-facts/fastly_ranges.yaml
+			| EOF
 	}
 	file { '/usr/local/bin/update-fastly-ips':
 		source => 'puppet:///modules/puppetmaster/update-fastly-ips.sh',