X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Fmanifests%2Fclient.pp;h=1485a0323c895c035148b936c4fdd151e98885ea;hb=da1bfe2ba13e4d1aca017b833b347ee5d471c6c6;hp=2d2e98a2976f2e0087f0cba1b776aaa449d24418;hpb=9a3546886af018242c160043bbd5d5affd339155;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index 2d2e98a29..1485a0323 100644
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -1,57 +1,79 @@
 class nagios::client inherits nagios {
-	package {
-		dsa-nagios-nrpe-config: ensure => purged;
-		dsa-nagios-checks: ensure => installed;
-	}
+    package {
+        dsa-nagios-nrpe-config: ensure => purged;
+        dsa-nagios-checks: ensure => installed;
+    }
 
-	file {
-		"/etc/default/nagios-nrpe-server":
-			source  => [ "puppet:///nagios/per-host/$fqdn/default",
-			             "puppet:///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" ],
-			require => Package["nagios-nrpe-server"],
-			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":
-                        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":
-			source  => [ "puppet:///nagios/dsa-nagios/generated/nrpe_dsa.cfg" ],
-			require => Package["dsa-nagios-checks"],
-			notify  => Exec["nagios-nrpe-server restart"];
+    file {
+        "/etc/default/nagios-nrpe-server":
+            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":
+            content => template("nagios/nrpe.cfg.erb"),
+            require => Package["nagios-nrpe-server"],
+            notify  => Exec["nagios-nrpe-server reload"],
+            ;
+        "/etc/nagios/nrpe.d":
+            mode    => 755,
+            require => Package["nagios-nrpe-server"],
+            ensure  => directory,
+            ;
+        "/etc/nagios/nrpe.d/debianorg.cfg":
+            content => template("nagios/inc-debian.org.erb"),
+            require => Package["nagios-nrpe-server"],
+            notify  => Exec["nagios-nrpe-server reload"],
+            ;
+        "/etc/nagios/nrpe.d/nrpe_dsa.cfg":
+            source  => [ "puppet:///modules/nagios/dsa-nagios/generated/nrpe_dsa.cfg" ],
+            require => Package["dsa-nagios-checks"],
+            notify  => Exec["nagios-nrpe-server reload"],
+            ;
 
-		"/etc/nagios/obsolete-packages-ignore":
-			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":
+            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":
+        "/etc/nagios/obsolete-packages-ignore.d/hostspecific":
                         content => template("nagios/obsolete-packages-ignore.d-hostspecific.erb"),
-			require => Package["dsa-nagios-checks"];
-	}
+            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":
-                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":
-                description     => "Allow nrpe from nagios master",
-                domain          => "ip6",
-                rule            => "proto tcp mod state state (NEW) dport (5666) @subchain 'nagios' { saddr (\$HOST_NAGIOS_V6) ACCEPT; }"
-        }
+    exec {
+        "nagios-nrpe-server restart":
+            path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+            refreshonly => true,
+            ;
+        "nagios-nrpe-server reload":
+            command     => "service ${name}",
+            path        => "/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; }",
+            notarule        => true,
+            ;
+        "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; }",
+            notarule        => true,
+            ;
+    }
 }
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: