X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Fmanifests%2Fclient.pp;h=e16e20f850707f648b7e2ac3c93b64b5d40127e2;hb=302bfadeb2245517c64c144426a5a7f387d11397;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..e16e20f85 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,8 @@ 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":
+                        content => template("nagios/obsolete-packages-ignore.d-hostspecific.erb"),
 			require => Package["dsa-nagios-checks"];
 	}
 
@@ -46,4 +45,16 @@ class nagios::client inherits nagios {
 		path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
 		refreshonly => true,
 	}
+        @ferm::rule { "dsa-nagios-v4":
+                description     => "Allow nrpe from nagios master",
+                rule            => "proto tcp mod state state (NEW) dport (5666) @subchain 'nagios' { saddr (\$HOST_NAGIOS_V4) ACCEPT; }"
+        }
+        @ferm::rule { "dsa-nagios-v6":
+                description     => "Allow nrpe from nagios master",
+                domain          => "ip6",
+                rule            => "proto tcp mod state state (NEW) dport (5666) @subchain 'nagios' { saddr (\$HOST_NAGIOS_V6) ACCEPT; }"
+        }
 }
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: