diff options
Diffstat (limited to 'manifests/cron')
| -rw-r--r-- | manifests/cron/base.pp | 12 | ||||
| -rw-r--r-- | manifests/cron/linux.pp | 8 |
2 files changed, 16 insertions, 4 deletions
diff --git a/manifests/cron/base.pp b/manifests/cron/base.pp index 3f7f8c0..5fc55d2 100644 --- a/manifests/cron/base.pp +++ b/manifests/cron/base.pp @@ -4,11 +4,17 @@ class puppet::cron::base inherits puppet::base { Service['puppet']{ enable => false, } - File['puppet_config']{ - notify => undef + + if defined (puppet::puppetmaster) {} + else { + File['puppet_config']{ + notify => undef + } } + + case $operatingsystem { - debian,openbsd: { + debian,openbsd,ubuntu: { #it's already disabled } default: { diff --git a/manifests/cron/linux.pp b/manifests/cron/linux.pp index be17498..75f11a3 100644 --- a/manifests/cron/linux.pp +++ b/manifests/cron/linux.pp @@ -4,9 +4,15 @@ class puppet::cron::linux inherits puppet::linux { case $puppet_config { '': { $puppet_config = '/etc/puppet/puppet.conf' } } + + case $puppet_crontime { + '': { $puppet_crontime = '0,30 * * * *' } + } + + File['/etc/cron.d/puppetd.cron']{ source => undef, content => "# run puppet -0,30 * * * * root /usr/sbin/puppetd --onetime --no-daemonize --splay --config=$puppet_config --color false | grep -E '(^err:|^alert:|^emerg:|^crit:)'\n", +$puppet_crontime root /usr/sbin/puppetd --onetime --no-daemonize --splay --config=$puppet_config --color false | grep -E '(^err:|^alert:|^emerg:|^crit:)'\n", } } |