diff options
Diffstat (limited to 'manifests/cron')
-rw-r--r-- | manifests/cron/base.pp | 13 | ||||
-rw-r--r-- | manifests/cron/linux.pp | 1 |
2 files changed, 8 insertions, 6 deletions
diff --git a/manifests/cron/base.pp b/manifests/cron/base.pp index b30b5b3..acef55e 100644 --- a/manifests/cron/base.pp +++ b/manifests/cron/base.pp @@ -18,14 +18,15 @@ class puppet::cron::base inherits puppet::base { } else { Service['puppet']{ hasstatus => false, + pattern => 'puppetd', + } + # this works only on < 2.6 + exec{'stop_puppet': + command => 'kill `cat /var/run/puppet/puppetd.pid`', + onlyif => 'test -f /var/run/puppet/puppetd.pid', + require => Service['puppet'], } } } } - # this works only on < 2.6 - exec{'stop_puppet': - command => 'kill `cat /var/run/puppet/puppetd.pid`', - onlyif => 'test -f /var/run/puppet/puppetd.pid', - require => Service['puppet'], - } } diff --git a/manifests/cron/linux.pp b/manifests/cron/linux.pp index 6e8baf5..a5008bf 100644 --- a/manifests/cron/linux.pp +++ b/manifests/cron/linux.pp @@ -14,5 +14,6 @@ class puppet::cron::linux inherits puppet::linux { File['/etc/cron.d/puppetd.cron']{ source => undef, content => "# run puppet\n$puppet_crontime root /usr/sbin/puppetd --onetime --no-daemonize --config=$puppet_config --color false $puppet_http_compression_str | grep -E '(^err:|^alert:|^emerg:|^crit:)'\n", + before => Service['puppet'], } } |