X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fentropykey%2Fmanifests%2Fprovider.pp;h=ea8cb5bdf130c3918136a7547aafc99c86bfce02;hb=f744f4e667b812821f3b36dcc9f191828e3d71e3;hp=9914810218de3a810cced59abe0c209ff66d64a7;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/entropykey/manifests/provider.pp b/modules/entropykey/manifests/provider.pp
index 991481021..ea8cb5bdf 100644
--- a/modules/entropykey/manifests/provider.pp
+++ b/modules/entropykey/manifests/provider.pp
@@ -11,16 +11,19 @@ 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::stunnel_server { 'ekeyd':
+	stunnel4::server { 'ekeyd':
 		accept  => 18888,
 		connect => '127.0.0.1:8888',
 	}