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

[dsa-puppet.git] / modules / entropykey / manifests / provider.pp

diff --git a/modules/entropykey/manifests/provider.pp b/modules/entropykey/manifests/provider.pp
index 8db64893081f6ef30bb7490a5765b1663f55c8a3..ea8cb5bdf130c3918136a7547aafc99c86bfce02 100644 (file)
--- a/modules/entropykey/manifests/provider.pp
+++ b/modules/entropykey/manifests/provider.pp
@@ -11,13 +11,16 @@ 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\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',
        }
 
        service { 'ekeyd':
                ensure  => running,
-               require => File['/etc/entropykey/ekeyd.conf'],
+               require => [
+                       File['/etc/entropykey/ekeyd.conf'],
+                       Package['ekeyd']
+               ]
        }
 
        stunnel4::server { 'ekeyd':