tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

puppet: Disable storeconfigs at master bootstrap

Browse source
This commit is contained in:
Ossi Salmi 2013-05-03 21:02:15 +03:00
parent be7b1ecafe
commit ea4b48b00a
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
puppet/bootstrap-server.sh
View file

@ -66,6 +66,7 @@ EOF
fi fi
cat >> /etc/puppet/manifests/node/${FQDN}.pp << EOF cat >> /etc/puppet/manifests/node/${FQDN}.pp << EOF
\$puppet_storeconfigs = "none"
include puppet::server::${SERVER} include puppet::server::${SERVER}
include puppet::manual include puppet::manual

18
puppet/manifests/init.pp
View file

@ -270,6 +270,14 @@ class puppet::server::common inherits puppet::client {
case $puppet_dbadapter { case $puppet_dbadapter {
"sqlite3": { "sqlite3": {
require ruby::sqlite3 require ruby::sqlite3
file { "/srv/puppet/storeconfigs":
ensure => directory,
mode => "0750",
owner => $user,
group => $group,
seltype => $seltype_readonly,
require => File["/srv/puppet"],
}
} }
"mysql": { "mysql": {
require ruby::mysql require ruby::mysql
@ -343,16 +351,6 @@ class puppet::server::common inherits puppet::client {
before => File["/srv/puppet/reports"], before => File["/srv/puppet/reports"],
} }
if $puppet_storeconfigs != "none" {
file { "/srv/puppet/storeconfigs":
ensure => directory,
mode => "0750",
owner => $user,
group => $group,
seltype => $seltype_readonly,
require => File["/srv/puppet"],
}
}
file { [ "/srv/puppet/bucket", file { [ "/srv/puppet/bucket",
"/srv/puppet/reports", "/srv/puppet/reports",
"/srv/puppet/rrd", ]: "/srv/puppet/rrd", ]: