ordering fixups

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

diff --git a/modules/entropykey/manifests/provider.pp b/modules/entropykey/manifests/provider.pp
index 9914810218de3a810cced59abe0c209ff66d64a7..f567e5566717374f5a858de111732f7882764c19 100644 (file)
--- 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 > /dev/null\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',
        }