X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpuppetmaster%2Fmanifests%2Finit.pp;h=f16e715bb63f30716548355174dae9813efd1bd5;hb=928c201da500d97cd03a0d8b3b57d880f5038ead;hp=8533a680f6344d8d44bd704903b85440e32f78de;hpb=83df2a0b3fd2d493c04fb117f5c7aa86e04582c4;p=mirror%2Fdsa-puppet.git

diff --git a/modules/puppetmaster/manifests/init.pp b/modules/puppetmaster/manifests/init.pp
index 8533a680f..f16e715bb 100644
--- a/modules/puppetmaster/manifests/init.pp
+++ b/modules/puppetmaster/manifests/init.pp
@@ -1,15 +1,8 @@
 class puppetmaster {
 
-	include site::params
-
 	package { 'puppetmaster':
-		ensure => $site::params::puppetversion,
-		notify => Service['puppetmaster']
-	}
-	service { 'puppetmaster':
-		ensure => running,
+		ensure => installed,
 	}
-
 	file { '/etc/puppet/hiera.yaml':
 		source => 'puppet:///modules/puppetmaster/hiera.yaml'
 	}
@@ -23,4 +16,11 @@ 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" |>>
 }