X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fstunnel4%2Fmanifests%2Finit.pp;h=d76684671b1b7a87ecd0f8c7c66efdf112b67e56;hb=0a02f36748e254e39c4c21446ebc58a354cf780e;hp=897ea8303b446583075c3d6477cb6abf2ffc9725;hpb=b364d79fcd605bcb306870ef2d6e2f690368b691;p=mirror%2Fdsa-puppet.git

diff --git a/modules/stunnel4/manifests/init.pp b/modules/stunnel4/manifests/init.pp
index 897ea8303..d76684671 100644
--- a/modules/stunnel4/manifests/init.pp
+++ b/modules/stunnel4/manifests/init.pp
@@ -16,15 +16,30 @@ class stunnel4 {
                 mode    => 555,
             ;
         }
+
+        case $client {
+                true: {
+                    $certfile = "/etc/ssl/debian/certs/thishost.crt"
+                    $keyfile = "/etc/ssl/debian/keys/thishost.key"
+                    }
+                default: {
+                    $certfile = "/etc/exim4/ssl/thishost.crt"
+                    $keyfile = "/etc/exim4/ssl/thishost.key"
+                    }
+        }
+
         exec {
             "restart_stunnel_${name}":
-                    command => "true && cd / && env -i /etc/init.d/stunnel4 restart ${name}",
+                    command => "true && cd / && env -i /etc/init.d/stunnel4 restart puppet-${name}",
                     require => [ File['/etc/stunnel/stunnel.conf'],
                                  File['/etc/init.d/stunnel4'],
                                  Exec['enable_stunnel4'],
                                  Exec['kill_file_override'],
                                  Package['stunnel4']
                                ],
+                    subscribe => [ File[$certfile],
+                                   File[$keyfile]
+                                 ],
                     refreshonly => true,
                     ;
         }