redo apache2 exec statements

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 7884116ac8b5857b3a6c52b81c4852e72a1b5069..719a71b5dd19002c934466ccb30c1afce2d92db8 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -35,28 +35,28 @@ class apache2 {
                "/etc/apache2/conf.d/ressource-limits":
                        content => template("apache2/ressource-limits.erb"),
                        require => Package["apache2"],
-                       notify  => Exec["apache2 reload"];
+                        notify  => Exec["reload-apache2"];
                "/etc/apache2/conf.d/security":
                        source  => [ "puppet:///apache2/per-host/$fqdn/etc/apache2/conf.d/security",
                                     "puppet:///apache2/common/etc/apache2/conf.d/security" ],
                        require => Package["apache2"],
-                       notify  => Exec["apache2 reload"];
+                        notify  => Exec["reload-apache2"];
                "/etc/apache2/conf.d/local-serverinfo":
                        source  => [ "puppet:///apache2/per-host/$fqdn/etc/apache2/conf.d/local-serverinfo",
                                     "puppet:///apache2/common/etc/apache2/conf.d/local-serverinfo" ],
                        require => Package["apache2"],
-                       notify  => Exec["apache2 reload"];
+                        notify  => Exec["reload-apache2"];
                "/etc/apache2/conf.d/server-status":
                        source  => [ "puppet:///apache2/per-host/$fqdn/etc/apache2/conf.d/server-status",
                                     "puppet:///apache2/common/etc/apache2/conf.d/server-status" ],
                        require => Package["apache2"],
-                       notify  => Exec["apache2 reload"];
+                        notify  => Exec["reload-apache2"];
 
                "/etc/apache2/sites-available/default-debian.org":
                        source  => [ "puppet:///apache2/per-host/$fqdn/etc/apache2/sites-available/default-debian.org",
                                     "puppet:///apache2/common/etc/apache2/sites-available/default-debian.org" ],
                        require => Package["apache2"],
-                       notify  => Exec["apache2 reload"];
+                        notify  => Exec["reload-apache2"];
 
                "/etc/logrotate.d/apache2":
                        source  => [ "puppet:///apache2/per-host/$fqdn/etc/logrotate.d/apache2",
@@ -80,8 +80,14 @@ class apache2 {
                #       ensure  => directory;
        }
 
-       exec { "apache2 reload":
-               path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-               refreshonly => true,
+       exec {
+            "reload-apache2":
+               command => "/etc/init.d/apache2 reload",
+               refreshonly => true;
+
+            "force-reload-apache2":
+               command => "/etc/init.d/apache2 force-reload",
+               refreshonly => true;
+
        }
 }

diff --git a/modules/apache2/manifests/security_mirror.pp b/modules/apache2/manifests/security_mirror.pp
index 4d60da3aa5dad614313538f7672e802d11eb298d..ee20e9d9eb8c9c2662c0ba258754833b71c93ffb 100644 (file)
--- a/modules/apache2/manifests/security_mirror.pp
+++ b/modules/apache2/manifests/security_mirror.pp
@@ -4,7 +4,7 @@ class apache2::security_mirror inherits apache2 {
                        source  => [ "puppet:///apache2/per-host/$fqdn/etc/apache2/sites-available/security.debian.org",
                                     "puppet:///apache2/common/etc/apache2/sites-available/security.debian.org" ],
                        require => Package["apache2"],
-                       notify  => Exec["apache2 reload"];
+                       notify  => Exec["reload-apache2"];
 
        }