summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/puppetmaster/checklastrun.pp10
-rw-r--r--manifests/puppetmaster/checklastrun/disable.pp2
2 files changed, 8 insertions, 4 deletions
diff --git a/manifests/puppetmaster/checklastrun.pp b/manifests/puppetmaster/checklastrun.pp
index 5a1b1c8..e4278c7 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':
- content => "${puppetmaster_lastruncheck_cron} root /usr/local/sbin/puppetlast ${puppet_lastruncheck_timeout_str} ${puppet_lastruncheck_ignorehosts_str} ${$puppet_lastruncheck_additionaloptions}\n",
+ '/etc/cron.d/puppetlast':
+ content => "${puppetmaster_lastruncheck_cron} root output=\$(/usr/local/sbin/puppetlast ${puppet_lastruncheck_timeout_str} ${puppet_lastruncheck_ignorehosts_str} ${$puppet_lastruncheck_additionaloptions} 2>&1) || echo \"\$output\"\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,
}
}