X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Fmanifests%2Fclient.pp;h=2b76eb62e1b4555cd16e51698321b2968e9a2491;hb=4d24877d97fbc89df792b28f60d22463f25a2bae;hp=7393260ea08bec1d433e849a4435b88b4ae3fe80;hpb=70a9bda9ef6e5fa2cebded47c59a11a2592c5511;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index 7393260ea..2b76eb62e 100644
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -14,8 +14,7 @@ class nagios::client inherits nagios {
 			ensure  => absent,
 			notify  => Exec["nagios-nrpe-server restart"];
 		"/etc/nagios/nrpe.cfg":
-			source  => [ "puppet:///modules/nagios/per-host/$fqdn/nrpe.cfg",
-			             "puppet:///modules/nagios/common/nrpe.cfg" ],
+			content => template("nagios/nrpe.cfg.erb"),
 			require => Package["nagios-nrpe-server"],
 			notify  => Exec["nagios-nrpe-server restart"];
 		"/etc/nagios/nrpe.d":
@@ -23,7 +22,7 @@ class nagios::client inherits nagios {
 			require => Package["nagios-nrpe-server"],
 			ensure  => directory;
 		"/etc/nagios/nrpe.d/debianorg.cfg":
-                        content => template("nagios/inc-debian.org.erb"),
+			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":
@@ -47,12 +46,14 @@ class nagios::client inherits nagios {
 	}
         @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; }"
+                rule            => "proto tcp mod state state (NEW) dport (5666) @subchain 'nagios' { saddr (\$HOST_NAGIOS_V4) ACCEPT; }",
+                notarule        => true,
         }
         @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; }"
+                rule            => "proto tcp mod state state (NEW) dport (5666) @subchain 'nagios' { saddr (\$HOST_NAGIOS_V6) ACCEPT; }",
+                notarule        => true,
         }
 }
 # vim:set et: