diff options
| author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2010-05-11 17:00:20 -0400 |
|---|---|---|
| committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2010-05-11 17:00:20 -0400 |
| commit | 57d8ecf86f49db2c9e367480e380a73cad4b71e6 (patch) | |
| tree | 473263b26fdb525e7e7c90efbf919b9d3f02dd99 /manifests/puppetmaster/base.pp | |
| parent | 0f0434a582c1f3bd274a79e51ab34a2f4887e659 (diff) | |
| parent | fc72cbc8a9d09b2d305df061dfc74cc960610d85 (diff) | |
Merge commit 'nadir/master'
Diffstat (limited to 'manifests/puppetmaster/base.pp')
| -rw-r--r-- | manifests/puppetmaster/base.pp | 40 |
1 files changed, 26 insertions, 14 deletions
diff --git a/manifests/puppetmaster/base.pp b/manifests/puppetmaster/base.pp index 0b208b0..4a1cb6f 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,22 +21,25 @@ 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 } - # restart the master from time to time to avoid memory problems - file{'/etc/cron.d/puppetmaster.cron': - source => [ "puppet://$server/modules/puppet/cron.d/puppetmaster.${operatingsystem}", - "puppet://$server/modules/puppet/cron.d/puppetmaster" ], - owner => root, group => 0, mode => 0644; + + if ! defined (puppet::puppetmaster::passenger) { + # restart the master from time to time to avoid memory problems + file{'/etc/cron.d/puppetmaster.cron': + source => [ "puppet://$server/modules/puppet/cron.d/puppetmaster.${operatingsystem}", + "puppet://$server/modules/puppet/cron.d/puppetmaster" ], + owner => root, group => 0, mode => 0644; + } } file{'/etc/cron.daily/puppet_reports_cleanup.sh': |