]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
etc/default/stunnel kills FILES
authorPeter Palfrader <peter@palfrader.org>
Tue, 24 May 2011 10:06:24 +0000 (12:06 +0200)
committerPeter Palfrader <peter@palfrader.org>
Tue, 24 May 2011 10:06:24 +0000 (12:06 +0200)
modules/stunnel4/manifests/init.pp

index af5a22bc3ad5b0ec8065ca2109202224069784df..8b26a061eb70290e1680270a73390c1d65b495b0 100644 (file)
@@ -88,9 +88,14 @@ 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'], 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'] ],
+                ;
     }
 }