X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fnagios%2Fmanifests%2Fclient.pp;h=7393260ea08bec1d433e849a4435b88b4ae3fe80;hb=d29ac285630ce6574f36c14b08e4de57f74a71f0;hp=9cea3378a4fec2f3abd6a5cc1fb167c832bb7ed2;hpb=78ceca7ca6540a83d24a89016263235c923543db;p=dsa-puppet.git

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index 9cea3378..7393260e 100644
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -6,16 +6,16 @@ class nagios::client inherits nagios {
 
 	file {
 		"/etc/default/nagios-nrpe-server":
-			source  => [ "puppet:///nagios/per-host/$fqdn/default",
-			             "puppet:///nagios/common/default" ],
+			source  => [ "puppet:///modules/nagios/per-host/$fqdn/default",
+			             "puppet:///modules/nagios/common/default" ],
 			require => Package["nagios-nrpe-server"],
 			notify  => Exec["nagios-nrpe-server restart"];
 		"/etc/default/nagios-nrpe":
 			ensure  => absent,
 			notify  => Exec["nagios-nrpe-server restart"];
 		"/etc/nagios/nrpe.cfg":
-			source  => [ "puppet:///nagios/per-host/$fqdn/nrpe.cfg",
-			             "puppet:///nagios/common/nrpe.cfg" ],
+			source  => [ "puppet:///modules/nagios/per-host/$fqdn/nrpe.cfg",
+			             "puppet:///modules/nagios/common/nrpe.cfg" ],
 			require => Package["nagios-nrpe-server"],
 			notify  => Exec["nagios-nrpe-server restart"];
 		"/etc/nagios/nrpe.d":
@@ -27,13 +27,13 @@ class nagios::client inherits nagios {
 			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" ],
+			source  => [ "puppet:///modules/nagios/dsa-nagios/generated/nrpe_dsa.cfg" ],
 			require => Package["dsa-nagios-checks"],
 			notify  => Exec["nagios-nrpe-server restart"];
 
 		"/etc/nagios/obsolete-packages-ignore":
-			source  => [ "puppet:///nagios/per-host/$fqdn/obsolete-packages-ignore",
-			             "puppet:///nagios/common/obsolete-packages-ignore" ],
+			source  => [ "puppet:///modules/nagios/per-host/$fqdn/obsolete-packages-ignore",
+			             "puppet:///modules/nagios/common/obsolete-packages-ignore" ],
 			require => Package["dsa-nagios-checks"];
 
 		"/etc/nagios/obsolete-packages-ignore.d/hostspecific":
@@ -45,8 +45,16 @@ class nagios::client inherits nagios {
 		path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
 		refreshonly => true,
 	}
-        @ferm::rule { "dsa-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) ACCEPT; }"
+                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: