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

diff --git a/modules/puppetmaster/manifests/init.pp b/modules/puppetmaster/manifests/init.pp
index 1aad49cb2..9fed0247b 100644
--- a/modules/puppetmaster/manifests/init.pp
+++ b/modules/puppetmaster/manifests/init.pp
@@ -1,16 +1,38 @@
 class puppetmaster {
 
+	package { 'puppetmaster':
+		ensure => installed,
+	}
 	file { '/etc/puppet/hiera.yaml':
 		source => 'puppet:///modules/puppetmaster/hiera.yaml'
 	}
+	file { '/etc/puppet/puppetdb.conf':
+		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)'
+		domain          => '(ip ip6)',
+		rule            => '&SERVICE_RANGE(tcp, 8140, $HOST_DEBIAN)',
 	}
-	@ferm::rule { 'dsa-puppet-v6':
-		domain          => 'ip6',
-		description     => 'Allow puppet access',
-		rule            => '&SERVICE_RANGE(tcp, 8140, $HOST_DEBIAN_V6)'
+
+	file { '/srv/puppet.debian.org/puppet-facts':
+		ensure => directory
+	}
+	concat { '/srv/puppet.debian.org/puppet-facts/onionbalance-services.yaml':
+	}
+	Concat::Fragment <<| tag == "onionbalance-services.yaml" |>>
+
+	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',
+		mode   => '0555',
 	}
 }