diff options
| author | nadir <nadir-technik@nadir.org> | 2010-03-07 23:06:33 +0100 |
|---|---|---|
| committer | nadir <nadir-technik@nadir.org> | 2010-03-07 23:06:33 +0100 |
| commit | fc72cbc8a9d09b2d305df061dfc74cc960610d85 (patch) | |
| tree | b29b5729ca00bbaca53996aeb034453097d39314 | |
| parent | 23c385e39e89ffd326bf12ad2d7b1640d4f65a95 (diff) | |
When using Passenger, we don't need /etc/cron.d/puppetmaster.cron
| -rw-r--r-- | manifests/puppetmaster/base.pp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/manifests/puppetmaster/base.pp b/manifests/puppetmaster/base.pp index 2305725..4a1cb6f 100644 --- a/manifests/puppetmaster/base.pp +++ b/manifests/puppetmaster/base.pp @@ -32,11 +32,14 @@ class puppet::puppetmaster::base inherits puppet::base { 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': |