X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Fmanifests%2Fclient.pp;h=5a799446a1b398c35fa7e149a7a8c768e5f8bf6f;hb=ad50a770aa795780dfa8d273ee2a6628776c575a;hp=8c6f94c81d8302e60343db547c50d23cfdbb6bee;hpb=e1d5c69770ca56c9585455473b9a445220b99c2c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index 8c6f94c81..5a799446a 100644
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -20,10 +20,10 @@ class nagios::client inherits nagios {
 			notify  => Exec["nagios-nrpe-server restart"];
 		"/etc/nagios/nrpe.d":
 			mode    => 755,
+			require => Package["nagios-nrpe-server"],
 			ensure  => directory;
 		"/etc/nagios/nrpe.d/debianorg.cfg":
-			source  => [ "puppet:///nagios/per-host/$fqdn/inc-debian.org",
-			             "puppet:///nagios/common/inc-debian.org" ],
+                        content => template("nagios/inc-debian.org.erb"),
 			require => Package["nagios-nrpe-server"],
 			notify  => Exec["nagios-nrpe-server restart"];
 		"/etc/nagios/nrpe.d/nrpe_dsa.cfg":
@@ -36,9 +36,9 @@ class nagios::client inherits nagios {
 			             "puppet:///nagios/common/obsolete-packages-ignore" ],
 			require => Package["dsa-nagios-checks"];
 
-		"/etc/nagios/obsolete-packages-ignore.d/perhost":
-			source  => [ "puppet:///nagios/per-host/$fqdn/obsolete-packages-ignore.d-perhost",
-			             "puppet:///nagios/common/obsolete-packages-ignore.d-perhost" ],
+		"/etc/nagios/obsolete-packages-ignore.d/hostspecific":
+			source  => [ "puppet:///nagios/per-host/$fqdn/obsolete-packages-ignore.d-hostspecific",
+			             "puppet:///nagios/common/obsolete-packages-ignore.d-hostspecific" ],
 			require => Package["dsa-nagios-checks"];
 	}