X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Fmanifests%2Finit.pp;h=70e08658a8b0495957c0e84a4772eef156f8bbc0;hb=571bbc5216b80239cdc76c7a17b9c45a2a2d9738;hp=73dd3a4b2503ce87b018a5d0dea9fe5c3195a9de;hpb=d6c8a48f501cbbcc06b7e34c1b9bd6ea50ba9953;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nagios/manifests/init.pp b/modules/nagios/manifests/init.pp
index 73dd3a4b2..70e08658a 100644
--- a/modules/nagios/manifests/init.pp
+++ b/modules/nagios/manifests/init.pp
@@ -1,41 +1,10 @@
-class nagios-client {
+class nagios {
 	package {
 		nagios-nrpe-server: ensure => installed;
-		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,
-			ensure  => directory;
-		"/etc/nagios/nrpe.d/debianorg.cfg":
-			source  => [ "puppet:///nagios/per-host/$fqdn/inc-debian.org",
-			             "puppet:///nagios/common/inc-debian.org" ],
-			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"];
-	}
-
-	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 spohr.debian.org",
+		rule            => 'proto tcp dport 5666 saddr $HOST_NAGIOS ACCEPT',
+		prio		=> "03"
 	}
 }
-