X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fpuppetmaster%2Fmanifests%2Finit.pp;h=99684ba752d63a2031ec3b9743984cf5e5e9b4fc;hb=6c85e519c941708efc164a51004d63c477a8b9b8;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..99684ba75 100644
--- a/modules/puppetmaster/manifests/init.pp
+++ b/modules/puppetmaster/manifests/init.pp
@@ -6,6 +6,9 @@ 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':
 		description     => 'Allow puppet access',
@@ -17,7 +20,10 @@ class puppetmaster {
 		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" |>>
 }