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

Added support for disabling or using thin storedconfigs into puppet::server class.

Browse source
This commit is contained in:
Timo Mkinen 2010-04-17 18:14:43 +03:00
parent 5e576c7269
commit 05b0b8ab70
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
puppet/manifests/init.pp
View file

@ -106,12 +106,24 @@ class puppet::manual inherits puppet::client {
# Array containing ports that puppetmaster should listen to. Defaults to # Array containing ports that puppetmaster should listen to. Defaults to
# [ "18140", "18141", "18142", "18143", ]. # [ "18140", "18141", "18142", "18143", ].
# #
# $puppet_storeconfigs:
# Store config type to use. Valid values are "thin", "full" and "none".
# Defaults to "thin".
#
class puppet::server inherits puppet::client { class puppet::server inherits puppet::client {
if ! $puppet_listenports { if ! $puppet_listenports {
$puppet_listenports = [ "18140", "18141", "18142", "18143", ] $puppet_listenports = [ "18140", "18141", "18142", "18143", ]
} }
case $puppet_storeconfigs {
"": { $puppet_storeconfigs = "thin" }
"thin","full","none": { }
default: {
fail("Invalid value ${puppet_storeconfigs} for variable \$puppet_storeconfigs.")
}
}
package { "puppet-server": package { "puppet-server":
ensure => installed, ensure => installed,
} }

3
puppet/templates/puppetmaster.conf.erb
View file

@ -12,7 +12,10 @@
# Server bucket store. # Server bucket store.
bucketdir = /srv/puppet/bucket bucketdir = /srv/puppet/bucket
<% if puppet_storeconfigs != 'none' -%>
# Use storeconfigs # Use storeconfigs
storeconfigs = true storeconfigs = true
<% if puppet_storeconfigs == 'thin' %> thin_storedconfigs = true<% end %>
dbadapter = sqlite3 dbadapter = sqlite3
dblocation = /srv/puppet/storeconfigs/storeconfigs.db dblocation = /srv/puppet/storeconfigs/storeconfigs.db
<% end -%>