X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpuppetmaster%2Fmanifests%2Finit.pp;h=08b400f5172771d6613976aec6325ab8cdced427;hb=13a25f50b3c02c19412a0b735c655ca203645105;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..08b400f51 100644
--- a/modules/puppetmaster/manifests/init.pp
+++ b/modules/puppetmaster/manifests/init.pp
@@ -1,8 +1,14 @@
 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':
 		description     => 'Allow puppet access',
@@ -13,4 +19,22 @@ class puppetmaster {
 		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':
+		source => 'puppet:///modules/puppetmaster/update-fastly-ips.cron'
+	}
+	file { '/etc/cron.d/update-fastly-ips':
+		ensure => absent,
+	}
+	file { '/usr/local/bin/update-fastly-ips':
+		source => 'puppet:///modules/puppetmaster/update-fastly-ips.sh',
+		mode   => '0555',
+	}
 }