From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 31 Mar 2009 18:37:11 +0000 (+0200)
Subject: Remove a duplicate, and add another file
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=79111f6c27c9d0d877043a0516458d11dd16d8f6;p=mirror%2Fdsa-puppet.git

Remove a duplicate, and add another file
---

diff --git a/modules/nagios/manifests/init.pp b/modules/nagios/manifests/init.pp
index 577c56fcb..b59960433 100644
--- a/modules/nagios/manifests/init.pp
+++ b/modules/nagios/manifests/init.pp
@@ -18,14 +18,14 @@ class nagiosclient {
 			             "puppet:///nagios/common/nrpe.cfg" ],
 			require => Package["nagios-nrpe-server"],
 			notify  => Exec["nagios-nrpe-server restart"];
-		"/etc/nagios/nrpe.cfg":
-			source  => [ "puppet:///nagios/per-host/$fqdn/nrpe.cfg",
-			             "puppet:///nagios/common/nrpe.cfg" ],
-			require => Package["nagios-nrpe-server"],
-			notify  => Exec["nagios-nrpe-server restart"];
 		"/etc/nagios/nrpe.d":
 			mode    => 755,
 			ensure  => directory;
+		"/etc/nagios/nrpe.d/debianorg.cfg":
+			source  => [ "puppet:///nagios/per-host/$fqdn/inc-debian.org",
+			             "puppet:///nagios/common/inc-debian.org" ],
+			require => Package["nagios-nrpe-server"],
+			notify  => Exec["nagios-nrpe-server restart"];
 		"/etc/nagios/nrpe.d/nrpe_dsa.cfg":
 			source  => [ "puppet:///nagios/dsa-nagios/generated/nrpe_dsa.cfg" ],
 			require => Package["nagios-nrpe-server"],