diff options
| author | intrigeri <intrigeri@boum.org> | 2013-05-01 11:22:25 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2013-05-01 11:22:25 +0200 |
| commit | 38f2b63ff38885542033b709f0d0f3c688fa8949 (patch) | |
| tree | a936778b3426e4ad4e5a3da7877ffd7655d6127a /manifests | |
| parent | 0cb07edbbb3952a2c787a15642c93e41bec3c330 (diff) | |
checklastrun cronjob: only pass output through in imperfect situations.
That is, silence it (and avoid nagging the administrators with email)
when all hosts are OK, and puppetlast exits with return code 0.
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/puppetmaster/checklastrun.pp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/puppetmaster/checklastrun.pp b/manifests/puppetmaster/checklastrun.pp index 660c7d9..e4278c7 100644 --- a/manifests/puppetmaster/checklastrun.pp +++ b/manifests/puppetmaster/checklastrun.pp @@ -22,7 +22,7 @@ class puppet::puppetmaster::checklastrun { mode => '0700'; '/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", + 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, |