From cc7164d44db34444c6bfec4a86d86f8d2734d6e4 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 11 Apr 2015 10:26:25 +0200 Subject: [PATCH] auto-restart broken stunnels --- modules/debian-org/templates/dsa-puppet-stuff.cron.erb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/debian-org/templates/dsa-puppet-stuff.cron.erb b/modules/debian-org/templates/dsa-puppet-stuff.cron.erb index 49d2e8a7..2e23805b 100644 --- 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 -- 2.39.2