X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpuppetmaster%2Fmanifests%2Finit.pp;h=7cb923c2836f5b7632c3305f85b4ad72c0e2cc91;hb=927981be74657fc57d0e23237179565aa87acd91;hp=b60e0b7574e8fd278e82c7d8c2c81b0caedbc470;hpb=13857f1b71f89293f072e116c553d298cd3a39c0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/puppetmaster/manifests/init.pp b/modules/puppetmaster/manifests/init.pp
index b60e0b757..7cb923c28 100644
--- a/modules/puppetmaster/manifests/init.pp
+++ b/modules/puppetmaster/manifests/init.pp
@@ -6,18 +6,37 @@ class puppetmaster {
 	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)'
 	}
-	@ferm::rule { 'dsa-puppet-v6':
+	ferm::rule { 'dsa-puppet-v6':
 		domain          => 'ip6',
 		description     => 'Allow puppet access',
 		rule            => '&SERVICE_RANGE(tcp, 8140, $HOST_DEBIAN_V6)'
 	}
 
-	ssl::service { 'puppet-dashboard.debian.org':
-		notify => Service['apache2'],
+	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 { 'dsa-puppet-stuff---fastly-ips':
+		target => '/etc/cron.d/dsa-puppet-stuff',
+		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',
 	}
 }