auto-restart broken stunnels

[dsa-puppet.git] / modules / debian-org / templates / dsa-puppet-stuff.cron.erb

diff --git a/modules/debian-org/templates/dsa-puppet-stuff.cron.erb b/modules/debian-org/templates/dsa-puppet-stuff.cron.erb
index 49d2e8a747ff5385094f69687d43ab0640a7c897..2e23805b98ec86634f7b44acd3ee9e06a873d692 100644 (file)
--- a/modules/debian-org/templates/dsa-puppet-stuff.cron.erb
+++ b/modules/debian-org/templates/dsa-puppet-stuff.cron.erb
@@ -14,3 +14,5 @@ SHELL=/bin/bash
 <% else -%>
 34 */4 * * * root if [ -x /usr/bin/puppet ]; then sleep $(( $RANDOM \% 7200 )); if [ -x /usr/bin/timeout ]; then TO="timeout --kill-after=900 3600"; else TO=""; fi; tmp="$(tempfile)"; egrep -v '^(#|$)' /etc/dsa/cron.ignore.dsa-puppet-stuff > "$tmp" && $TO /usr/bin/puppet agent --onetime --no-daemonize 2>&1 | egrep --text -v -f "$tmp"; rm -f "$tmp"; fi
 <% end -%>
+
+@hourly root sleep $(( $RANDOM \% 300 )); if [ -x /usr/lib/nagios/plugins/dsa-check-stunnel-sanity ] && [ -e /etc/stunnel/puppet-ekeyd.conf ] && ! /usr/lib/nagios/plugins/dsa-check-stunnel-sanity > /dev/null; then service stunnel4 restart; fi