diff options
| author | varac <varacanero@zeromail.org> | 2010-02-04 17:44:26 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2010-02-04 17:44:26 +0100 |
| commit | a15d322a91e6c438f65a23b4fe5fb8d63c32def0 (patch) | |
| tree | 5562ca3bb1d5c58e02aeeb31e233b4bd393e6e1a /manifests/puppetmaster | |
| parent | 32d27ed3e0378a5e4545e247115e371b92b9924e (diff) | |
Allowes puppet::cron also on the puppetmaster server
Diffstat (limited to 'manifests/puppetmaster')
| -rw-r--r-- | manifests/puppetmaster/base.pp | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/manifests/puppetmaster/base.pp b/manifests/puppetmaster/base.pp index 0b208b0..2305725 100644 --- a/manifests/puppetmaster/base.pp +++ b/manifests/puppetmaster/base.pp @@ -1,9 +1,18 @@ class puppet::puppetmaster::base inherits puppet::base { + if defined (puppet::cron) { + File[puppet_config]{ + source => [ "puppet://$server/modules/site-puppet/master/puppet.conf", + "puppet://$server/modules/puppet/master/puppet.conf" ], + notify => Service[puppetmaster], + } + } + else { + File[puppet_config]{ + source => [ "puppet://$server/modules/site-puppet/master/puppet.conf", + "puppet://$server/modules/puppet/master/puppet.conf" ], + notify => [Service[puppet],Service[puppetmaster] ], + } - File[puppet_config]{ - source => [ "puppet://$server/modules/site-puppet/master/puppet.conf", - "puppet://$server/modules/puppet/master/puppet.conf" ], - notify => [Service[puppet],Service[puppetmaster] ], } $real_puppet_fileserverconfig = $puppet_fileserverconfig ? { @@ -12,12 +21,12 @@ class puppet::puppetmaster::base inherits puppet::base { } file { "$real_puppet_fileserverconfig": - source => [ "puppet://$server/modules/site-puppet/master/${fqdn}/fileserver.conf", - "puppet://$server/modules/site-puppet/master/fileserver.conf", - "puppet://$server/modules/puppet/master/fileserver.conf" ], - notify => [Service[puppet],Service[puppetmaster] ], + source => [ "puppet://$server/modules/site-puppet/master/${fqdn}/fileserver.conf", + "puppet://$server/modules/site-puppet/master/fileserver.conf", + "puppet://$server/modules/puppet/master/fileserver.conf" ], + notify => [Service[puppet],Service[puppetmaster] ], owner => root, group => puppet, mode => 640; - } + } if $puppetmaster_storeconfigs { include puppet::puppetmaster::storeconfigs |