projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updatemotd exec is not used anywhere anymore. Remove.
[mirror/dsa-puppet.git]
/
modules
/
puppetmaster
/
manifests
/
init.pp
diff --git
a/modules/puppetmaster/manifests/init.pp
b/modules/puppetmaster/manifests/init.pp
index
b60e0b7
..
99684ba
100644
(file)
--- 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/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',
@ferm::rule { 'dsa-puppet':
description => 'Allow puppet access',
@@
-17,7
+20,10
@@
class puppetmaster {
rule => '&SERVICE_RANGE(tcp, 8140, $HOST_DEBIAN_V6)'
}
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" |>>
}
}