X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Fmanifests%2Fclient.pp;h=33808c45a44752d7567102aab65768c108143c89;hb=24409d094a53a1ef3c4abeaf707541a00c24f800;hp=30ae93c302076294c9b4e3badf7b6c098953b7b5;hpb=1e65fd8f043823ed2021478f1ed95f1ec902dd9c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index 30ae93c30..33808c45a 100644
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -18,7 +18,7 @@ class nagios::client inherits nagios {
         "/etc/nagios/nrpe.cfg":
             content => template("nagios/nrpe.cfg.erb"),
             require => Package["nagios-nrpe-server"],
-            notify  => Exec["nagios-nrpe-server restart"],
+            notify  => Exec["service nagios-nrpe-server reload"],
             ;
         "/etc/nagios/nrpe.d":
             mode    => 755,
@@ -28,12 +28,12 @@ class nagios::client inherits nagios {
         "/etc/nagios/nrpe.d/debianorg.cfg":
             content => template("nagios/inc-debian.org.erb"),
             require => Package["nagios-nrpe-server"],
-            notify  => Exec["nagios-nrpe-server restart"],
+            notify  => Exec["service nagios-nrpe-server reload"],
             ;
         "/etc/nagios/nrpe.d/nrpe_dsa.cfg":
             source  => [ "puppet:///modules/nagios/dsa-nagios/generated/nrpe_dsa.cfg" ],
             require => Package["dsa-nagios-checks"],
-            notify  => Exec["nagios-nrpe-server restart"],
+            notify  => Exec["service nagios-nrpe-server reload"],
             ;
 
         "/etc/nagios/obsolete-packages-ignore":
@@ -48,9 +48,18 @@ class nagios::client inherits nagios {
             ;
     }
 
-    exec { "nagios-nrpe-server restart":
-        path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-        refreshonly => true,
+    exec {
+        "nagios-nrpe-server restart":
+            path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+            refreshonly => true,
+            ;
+        "service nagios-nrpe-server reload":
+# remove after lenny EOL (lenny has no service binary)
+# -cut-
+            command    => "/etc/init.d/nagios-nrpe-server reload",
+# -cut-
+            refreshonly => true,
+            ;
     }
 
     @ferm::rule {