From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 22 Jan 2012 12:47:20 +0000 (+0100)
Subject: Only reload nrpe server when some config files change
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=da1bfe2ba13e4d1aca017b833b347ee5d471c6c6

Only reload nrpe server when some config files change
---

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index 30ae93c3..1485a032 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["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["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["nagios-nrpe-server reload"],
             ;
 
         "/etc/nagios/obsolete-packages-ignore":
@@ -48,9 +48,16 @@ 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,
+            ;
+        "nagios-nrpe-server reload":
+            command     => "service ${name}",
+            path        => "/usr/bin:/usr/sbin:/bin:/sbin",
+            refreshonly => true,
+            ;
     }
 
     @ferm::rule {