diff options
| -rw-r--r-- | manifests/cron/base.pp | 4 | ||||
| -rw-r--r-- | manifests/puppetmaster/linux.pp | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/manifests/cron/base.pp b/manifests/cron/base.pp index 7daa6fb..5c7a708 100644 --- a/manifests/cron/base.pp +++ b/manifests/cron/base.pp @@ -6,12 +6,12 @@ class puppet::cron::base inherits puppet::base { } case $operatingsystem { - debian,openbsd,ubuntu: { + openbsd: { #it's already disabled } default: { $puppet_majorversion = regsubst($puppetversion,'^(\d+\.\d+).*$','\1') - if $puppet_majorversion == '2.6' { + if $puppet_majorversion >= '2.6' { Service['puppet']{ ensure => stopped, } diff --git a/manifests/puppetmaster/linux.pp b/manifests/puppetmaster/linux.pp index ebf183b..39ca544 100644 --- a/manifests/puppetmaster/linux.pp +++ b/manifests/puppetmaster/linux.pp @@ -1,10 +1,15 @@ class puppet::puppetmaster::linux inherits puppet::linux { if $puppetmaster_mode == 'passenger' { + + require('apache::base') + exec { 'notify_passenger_puppetmaster': refreshonly => true, - command => '/usr/bin/touch /etc/puppet/rack/tmp/restart.txt && sleep 1 && /bin/rm /etc/puppet/rack/tmp/restart.txt', + # command => '/usr/bin/touch /etc/puppet/rack/tmp/restart.txt && sleep 1 && /bin/rm /etc/puppet/rack/tmp/restart.txt', + command => '/etc/init.d/apache2 reload', } + } else { service { 'puppetmaster': ensure => running, |