summaryrefslogtreecommitdiff
path: root/manifests/cron
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2011-03-28 18:00:52 -0400
committerMicah Anderson <micah@riseup.net>2011-03-28 18:00:52 -0400
commit5d21f8f46c5b089160b1f377c140d3c4de46ed54 (patch)
treea6b302c153186cbce98ca5decdf6847293d63b3c /manifests/cron
parent6729b2e5e2f8d9086985f12b15df2153192f3023 (diff)
update cronjob to capture the return code output as suggested by LeLutin in https://labs.riseup.net/code/issues/2819
Diffstat (limited to 'manifests/cron')
-rw-r--r--manifests/cron/linux.pp2
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/cron/linux.pp b/manifests/cron/linux.pp
index 5f8ac98..15adb65 100644
--- a/manifests/cron/linux.pp
+++ b/manifests/cron/linux.pp
@@ -14,7 +14,7 @@ class puppet::cron::linux inherits puppet::linux {
File['/etc/cron.d/puppetd.cron']{
source => undef,
- content => "# run puppet\n$puppet_crontime root /usr/sbin/puppetd --onetime --no-daemonize --config=$puppet_config --color false $puppet_http_compression_str | grep -E '(^err:|^alert:|^emerg:|^crit:)'; if [ $? -eq 1 ]; then exit 0; fi\n",
+ 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'],
}
}