projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use proper directory
[mirror/dsa-puppet.git]
/
modules
/
puppetmaster
/
manifests
/
init.pp
diff --git
a/modules/puppetmaster/manifests/init.pp
b/modules/puppetmaster/manifests/init.pp
index
43432af
..
f16e715
100644
(file)
--- a/
modules/puppetmaster/manifests/init.pp
+++ b/
modules/puppetmaster/manifests/init.pp
@@
-1,9
+1,7
@@
class puppetmaster {
class puppetmaster {
- include site::params
-
package { 'puppetmaster':
package { 'puppetmaster':
- ensure =>
$site::params::puppetversion
,
+ ensure =>
installed
,
}
file { '/etc/puppet/hiera.yaml':
source => 'puppet:///modules/puppetmaster/hiera.yaml'
}
file { '/etc/puppet/hiera.yaml':
source => 'puppet:///modules/puppetmaster/hiera.yaml'
@@
-18,4
+16,11
@@
class puppetmaster {
description => 'Allow puppet access',
rule => '&SERVICE_RANGE(tcp, 8140, $HOST_DEBIAN_V6)'
}
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" |>>
}
}