From 73daac9163a53a33d2845be81082b61a7ed8b246 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 11 Apr 2015 10:56:04 +0200 Subject: [PATCH] only on stunnel clients --- modules/debian-org/templates/dsa-puppet-stuff.cron.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/debian-org/templates/dsa-puppet-stuff.cron.erb b/modules/debian-org/templates/dsa-puppet-stuff.cron.erb index b962bd67d..d76f0b440 100644 --- a/modules/debian-org/templates/dsa-puppet-stuff.cron.erb +++ b/modules/debian-org/templates/dsa-puppet-stuff.cron.erb @@ -15,4 +15,4 @@ SHELL=/bin/bash 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 > /dev/null; fi +@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 && grep -q 'client = yes' /etc/stunnel/puppet-ekeyd.conf; then service stunnel4 restart > /dev/null; fi -- 2.20.1