diff options
| author | intrigeri <intrigeri@boum.org> | 2013-04-23 17:54:09 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2013-04-23 17:54:09 +0200 |
| commit | 0cb07edbbb3952a2c787a15642c93e41bec3c330 (patch) | |
| tree | b21a057cff94eba5833f46c09e1fabe80be7861c | |
| parent | fa4b8e6f966d453d891da2101807c5493625e65c (diff) | |
Install puppetlast cronjob under a usable name.
That is, install it as /etc/cron.d/puppetlast,
and cleanup the old buggy /etc/cron.d/puppetlast.cron.
As cron(8) says about /etc/cron.d/: "For example, any file containing dots will
be ignored."
| -rw-r--r-- | manifests/puppetmaster/checklastrun.pp | 8 | ||||
| -rw-r--r-- | manifests/puppetmaster/checklastrun/disable.pp | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/manifests/puppetmaster/checklastrun.pp b/manifests/puppetmaster/checklastrun.pp index 5a1b1c8..660c7d9 100644 --- a/manifests/puppetmaster/checklastrun.pp +++ b/manifests/puppetmaster/checklastrun.pp @@ -21,12 +21,16 @@ class puppet::puppetmaster::checklastrun { group => 0, mode => '0700'; - '/etc/cron.d/puppetlast.cron': + '/etc/cron.d/puppetlast': content => "${puppetmaster_lastruncheck_cron} root /usr/local/sbin/puppetlast ${puppet_lastruncheck_timeout_str} ${puppet_lastruncheck_ignorehosts_str} ${$puppet_lastruncheck_additionaloptions}\n", require => File['/usr/local/sbin/puppetlast'], owner => root, group => 0, mode => '0644', - notify => Service['cron'] + notify => Service['cron']; + + # Cleanup cronjob previously installed under a buggy name. + '/etc/cron.d/puppetlast.cron': + ensure => absent; } } diff --git a/manifests/puppetmaster/checklastrun/disable.pp b/manifests/puppetmaster/checklastrun/disable.pp index 8fff212..8559280 100644 --- a/manifests/puppetmaster/checklastrun/disable.pp +++ b/manifests/puppetmaster/checklastrun/disable.pp @@ -5,7 +5,7 @@ class puppet::puppetmaster::checklastrun::disable inherits puppet::puppetmaster: ensure => absent, } - File['/etc/cron.d/puppetlast.cron']{ + File['/etc/cron.d/puppetlast']{ ensure => absent, } } |