]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
service is in usr/sbin, which isn't in PATH
authorPeter Palfrader <peter@palfrader.org>
Sat, 11 Apr 2015 09:37:08 +0000 (11:37 +0200)
committerPeter Palfrader <peter@palfrader.org>
Sat, 11 Apr 2015 09:37:08 +0000 (11:37 +0200)
modules/debian-org/templates/dsa-puppet-stuff.cron.erb

index e15db7f0d1378d592fa25933f5081f935cd3799e..6bd13a131ddce1890a795dee586b658da958ca34 100644 (file)
@@ -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 && grep -q '^client = yes' /etc/stunnel/puppet-ekeyd.conf; 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 /usr/sbin/service stunnel4 restart > /dev/null; fi