diff options
| -rw-r--r-- | manifests/cron/linux.pp | 4 | ||||
| -rw-r--r-- | manifests/puppetmaster/checklastrun.pp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/manifests/cron/linux.pp b/manifests/cron/linux.pp index 263dc3f..e00b4d0 100644 --- a/manifests/cron/linux.pp +++ b/manifests/cron/linux.pp @@ -13,11 +13,13 @@ class puppet::cron::linux inherits puppet::linux { $puppet_crontime = "${puppet_crontime_interval_minute},${puppet_crontime_interval_minute2} * * * *" } + include ::cron + File['/etc/cron.d/puppetd.cron']{ source => undef, content => "#run puppet\n${puppet_crontime} root output=\$(/usr/sbin/puppetd --onetime --no-daemonize --splay --config=/etc/puppet/puppet.conf --color false); ret=\$?; printf \"\\%s\" \"\$output\" | grep -E '(^err:|^alert:|^emerg:|^crit:)'; exit \$ret\n", before => Service['puppet'], ensure => present, - notify => service['cron'] + notify => Service['cron'] } } diff --git a/manifests/puppetmaster/checklastrun.pp b/manifests/puppetmaster/checklastrun.pp index b57ec05..5a1b1c8 100644 --- a/manifests/puppetmaster/checklastrun.pp +++ b/manifests/puppetmaster/checklastrun.pp @@ -12,6 +12,8 @@ class puppet::puppetmaster::checklastrun { default => "--timeout ${::puppet_lastruncheck_timeout}" } + include ::cron + file{ '/usr/local/sbin/puppetlast': source => [ 'puppet:///modules/puppet/master/lastruncheck' ], @@ -25,6 +27,6 @@ class puppet::puppetmaster::checklastrun { owner => root, group => 0, mode => '0644', - notify => service['cron'] + notify => Service['cron'] } } |