From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 24 May 2011 10:06:24 +0000 (+0200)
Subject: etc/default/stunnel kills FILES
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=b52ef14be50128d1dbe8c623b432a4db90a76c7e;p=mirror%2Fdsa-puppet.git

etc/default/stunnel kills FILES
---

diff --git a/modules/stunnel4/manifests/init.pp b/modules/stunnel4/manifests/init.pp
index af5a22bc3..8b26a061e 100644
--- a/modules/stunnel4/manifests/init.pp
+++ b/modules/stunnel4/manifests/init.pp
@@ -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'] ],
+                ;
     }
 }