X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fstunnel4%2Fmanifests%2Finit.pp;h=fcedab8c3964dd960d997040d0406094e29d423c;hb=20cea96ebb2e31dbcfddfccdebe934f828f5c8ab;hp=96aee45f71f6ddb26a87e8cc6439345934937b2a;hpb=bdb4170c047237cf8a9ad198bc5cadfcd68cb920;p=mirror%2Fdsa-puppet.git

diff --git a/modules/stunnel4/manifests/init.pp b/modules/stunnel4/manifests/init.pp
index 96aee45f7..fcedab8c3 100644
--- a/modules/stunnel4/manifests/init.pp
+++ b/modules/stunnel4/manifests/init.pp
@@ -1,10 +1,20 @@
 class stunnel4 {
     define stunnel_generic($client, $verify, $cafile, $crlfile=false, $accept, $connect, $local=false) {
         file {
+            "/etc/stunnel":
+                ensure  => directory,
+                owner   => root,
+                group   => root,
+                mode    => 755,
+                ;
             "/etc/stunnel/puppet-${name}.conf":
                 content => template("stunnel4/stunnel.conf.erb"),
                 notify  => Exec['restart_stunnel'],
                 ;
+            "/etc/init.d/stunnel4":
+                source => "puppet:///modules/stunnel4/etc-init.d-stunnel4",
+                mode    => 555,
+            ;
         }
     }
 
@@ -54,7 +64,6 @@ class stunnel4 {
                 cafile => "/etc/stunnel/puppet-${name}-peer.pem",
                 accept => "${accept}",
                 connect => "${connecthost}:${connectport}",
-                require => [ File["/etc/stunnel/puppet-${name}-peer.pem"] ],
                 ;
         }
     }
@@ -79,9 +88,19 @@ class stunnel4 {
                 ;
         "restart_stunnel":
                 command => "true && cd / && env -i /etc/init.d/stunnel4 restart",
-                require => [ File['/etc/stunnel/stunnel.conf'], Exec['enable_stunnel4'], Package['stunnel4'] ],
+                require => [ File['/etc/stunnel/stunnel.conf'],
+                             File['/etc/init.d/stunnel4'],
+                             Exec['enable_stunnel4'],
+                             Exec['kill_file_override'],
+                             Package['stunnel4']
+                           ],
                 refreshonly => true,
                 ;
+        "kill_file_override":
+                command => "sed -i -e 's/^FILES=/#&/' /etc/default/stunnel4",
+                onlyif => "grep -q '^FILES=' /etc/default/stunnel4",
+                require => [ Package['stunnel4'] ],
+                ;
     }
 }