From: Paul Wise <pabs@debian.org>
Date: Tue, 14 Oct 2014 02:30:13 +0000 (+0800)
Subject: Show full error messages when there is a problem restarting stunnel.
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=945a8d12f249132523dd1ec6b1dc8ce691c35b99;p=dsa-puppet.git

Show full error messages when there is a problem restarting stunnel.
---

diff --git a/modules/entropykey/manifests/provider.pp b/modules/entropykey/manifests/provider.pp
index f567e556..ea8cb5bd 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 > /dev/null\n",
+		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",
 		mode    => '0555',
 	}