diff options
| author | mh <mh@immerda.ch> | 2012-06-05 18:59:39 -0300 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2012-06-08 13:09:47 -0300 |
| commit | 09c8eaf304d1075980d8d9143545f2f16a1db34d (patch) | |
| tree | 57ab2c761e74eb95f873b72a109c2a620656469b /manifests/base.pp | |
| parent | af97bf0e96167e916e36110eb858f257ccf083e6 (diff) | |
new style for 2.7
Diffstat (limited to 'manifests/base.pp')
| -rw-r--r-- | manifests/base.pp | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index 695241c..9e597a8 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -1,36 +1,33 @@ class puppet::base { - if !$puppet_config { $puppet_config = '/etc/puppet/puppet.conf' } - - $puppet_majorversion = regsubst($puppetversion,'^(\d+\.\d+).*$','\1') - - case $puppet_cleanup_clientbucket { + $puppet_majorversion = regsubst($::puppetversion,'^(\d+\.\d+).*$','\1') + case $puppet::cleanup_clientbucket { # if not set, don't do anything - '',undef: {} - default: { + '',undef,false: {} + default: { tidy { "/var/lib/puppet/clientbucket": backup => false, recurse => true, rmdirs => true, type => mtime, - age => "$puppet_cleanup_clientbucket"; + age => "$puppet::cleanup_clientbucket"; } } } file { 'puppet_config': - path => "$puppet_config", - source => [ "puppet:///modules/site-puppet/client/${fqdn}/puppet.conf", - "puppet:///modules/site-puppet/client/puppet.conf.$operatingsystem", - "puppet:///modules/site-puppet/client/puppet.conf", - "puppet:///modules/puppet/client/${puppet_majorversion}/puppet.conf.$operatingsystem", + path => $puppet::config, + source => [ "puppet:///modules/site_puppet/client/${::fqdn}/puppet.conf", + "puppet:///modules/site_puppet/client/puppet.conf.${::operatingsystem}", + "puppet:///modules/site_puppet/client/puppet.conf", + "puppet:///modules/puppet/client/${puppet_majorversion}/puppet.conf.${::operatingsystem}", "puppet:///modules/puppet/client/${puppet_majorversion}/puppet.conf", - "puppet:///modules/puppet/client/puppet.conf.$operatingsystem", + "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 + # 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; + owner => puppet, group => 0, mode => 600; } service { 'puppet': |