From: Paul Wise <pabs@debian.org>
Date: Sun, 30 Nov 2014 08:26:58 +0000 (+0800)
Subject: Use chronic instead of filtering the output of the stunnel4 init script on restart
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;ds=sidebyside;h=c9032ccd0ab3f503a9492077f4a1926d8cef558a;hp=190141f23da1499f30a680f5f00412326deace0d;p=mirror%2Fdsa-puppet.git

Use chronic instead of filtering the output of the stunnel4 init script on restart
---

diff --git a/modules/entropykey/manifests/provider.pp b/modules/entropykey/manifests/provider.pp
index ea8cb5bdf..d69ac2219 100644
--- a/modules/entropykey/manifests/provider.pp
+++ b/modules/entropykey/manifests/provider.pp
@@ -11,7 +11,7 @@ class entropykey::provider {
 	# our CRL expires after a while (2 or 4 weeks?), so we have
 	# to restart stunnel so it loads the new CRL.
 	file { '/etc/cron.weekly/stunnel-ekey-restart':
-		content => "#!/bin/sh\n# This file is under puppet control\n# weekly restart of stunnel on ${::hostname}\nenv -i /etc/init.d/stunnel4 restart puppet-ekeyd | grep -vF 'Restarting SSL tunnels: [stopped: /etc/stunnel/puppet-ekeyd.conf] [Started: /etc/stunnel/puppet-ekeyd.conf] stunnel.'\n",
+		content => "#!/bin/sh\n# This file is under puppet control\n# weekly restart of stunnel on ${::hostname}\nenv -i chronic /etc/init.d/stunnel4 restart puppet-ekeyd\n",
 		mode    => '0555',
 	}