diff options
Diffstat (limited to 'manifests/base.pp')
| -rw-r--r-- | manifests/base.pp | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index 0a6e2f9..69a7568 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -1,8 +1,23 @@ class puppet::base { + if !$puppet_config { $puppet_config = '/etc/puppet/puppet.conf' } $puppet_majorversion = regsubst($puppetversion,'^(\d+\.\d+).*$','\1') + case $puppet_cleanup_clientbucket { + # if not set, don't do anything + '': {} + default: { + tidy { "/var/lib/puppet/clientbucket": + backup => false, + recurse => true, + rmdirs => true, + type => mtime, + age => "$puppet_cleanup_clientbucket"; + } + } + } + file { 'puppet_config': path => "$puppet_config", source => [ "puppet:///modules/site-puppet/client/${fqdn}/puppet.conf", @@ -13,11 +28,12 @@ class puppet::base { "puppet:///modules/puppet/client/puppet.conf.$operatingsystem", "puppet:///modules/puppet/client/puppet.conf" ], notify => Service[puppet], - # if puppetmasterd is deployed by apache2/passenger it needs to read puppet.conf - # therefore it must be readable by puppet + # if puppetmasterd is deployed by apache2/passenger it needs to read puppet.conf + # therefore it must be readable by puppet owner => puppet, group => 0, mode => 600; } - service{'puppet': + + service { 'puppet': ensure => running, enable => true, hasstatus => true, |