From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 27 May 2011 10:07:15 +0000 (+0200)
Subject: Try to restart only the affected stunnel
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=b364d79fcd605bcb306870ef2d6e2f690368b691;p=mirror%2Fdsa-puppet.git

Try to restart only the affected stunnel
---

diff --git a/modules/stunnel4/manifests/init.pp b/modules/stunnel4/manifests/init.pp
index fcedab8c3..897ea8303 100644
--- a/modules/stunnel4/manifests/init.pp
+++ b/modules/stunnel4/manifests/init.pp
@@ -9,13 +9,25 @@ class stunnel4 {
                 ;
             "/etc/stunnel/puppet-${name}.conf":
                 content => template("stunnel4/stunnel.conf.erb"),
-                notify  => Exec['restart_stunnel'],
+                notify  => Exec["restart_stunnel_${name}"],
                 ;
             "/etc/init.d/stunnel4":
                 source => "puppet:///modules/stunnel4/etc-init.d-stunnel4",
                 mode    => 555,
             ;
         }
+        exec {
+            "restart_stunnel_${name}":
+                    command => "true && cd / && env -i /etc/init.d/stunnel4 restart ${name}",
+                    require => [ File['/etc/stunnel/stunnel.conf'],
+                                 File['/etc/init.d/stunnel4'],
+                                 Exec['enable_stunnel4'],
+                                 Exec['kill_file_override'],
+                                 Package['stunnel4']
+                               ],
+                    refreshonly => true,
+                    ;
+        }
     }
 
     # define an stunnel listener, listening for SSL connections on $accept,
@@ -54,7 +66,7 @@ class stunnel4 {
                 # source  => "puppet:///modules/exim/certs/${connecthost}.crt",
                 content => generate("/bin/cat", "/etc/puppet/modules/exim/files/certs/${connecthost}.crt",
                                                 "/etc/puppet/modules/exim/files/certs/ca.crt"),
-                notify  => Exec['restart_stunnel'],
+                notify  => Exec["restart_stunnel_${name}"],
                 ;
         }
         stunnel_generic {
@@ -86,16 +98,6 @@ class stunnel4 {
                 unless => "grep -q '^ENABLED=1' /etc/default/stunnel4",
                 require => [ Package['stunnel4'] ],
                 ;
-        "restart_stunnel":
-                command => "true && cd / && env -i /etc/init.d/stunnel4 restart",
-                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",