X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Fmanifests%2Fclient.pp;h=053c6dc6b83a03ec7a8a9eaf08fa65f736930470;hb=8e9a688dd67c65c08c9c4f90bf0f5a7df15549a5;hp=d323451322a4f9118ea58ebddcc3a26aebb0f0ac;hpb=414f8f46e15bfc9e31e54857571d9fc7a6502b05;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index d32345132..053c6dc6b 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":
@@ -35,10 +35,19 @@ class nagios::client inherits nagios {
 			source  => [ "puppet:///nagios/per-host/$fqdn/obsolete-packages-ignore",
 			             "puppet:///nagios/common/obsolete-packages-ignore" ],
 			require => Package["dsa-nagios-checks"];
+
+		"/etc/nagios/obsolete-packages-ignore.d/hostspecific":
+                        content => template("nagios/obsolete-packages-ignore.d-hostspecific.erb"),
+			require => Package["dsa-nagios-checks"];
 	}
 
 	exec { "nagios-nrpe-server restart":
 		path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
 		refreshonly => true,
 	}
+        ferm::rule { "dsa-nagios":
+                domain          => "(ip ip6)",
+                description     => "Allow nrpe from nagios master",
+                rule            => "proto tcp mod state state (NEW) dport (5666) @subchain 'nagios' { saddr (\$HOST_NAGIOS) ACCEPT; }"
+        }
 }