X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Fmanifests%2Finit.pp;h=4975a413456df667b85a5f7b60a8d4a92050fa77;hb=215a052cae9e4e1862c9ce67461ae4091d95371d;hp=24f092af2c18088d989780e9d26c19a210937139;hpb=827241b81f736199464e08b2e772714754a15b81;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nagios/manifests/init.pp b/modules/nagios/manifests/init.pp
index 24f092af2..4975a4134 100644
--- a/modules/nagios/manifests/init.pp
+++ b/modules/nagios/manifests/init.pp
@@ -1,40 +1,8 @@
-class nagios-client {
+class nagios {
 	package {
-		nagios-nrpe-server: ensure => installed,
-		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.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/nrpe_dsa.cfg":
-			source  => [ "puppet:///nagios/dsa-nagios/generated/nrpe_dsa.cfg" ],
-			require => Package["nagios-nrpe-server"],
-			notify  => Exec["nagios-nrpe-server restart"];
-	}
-
-	exec { "nagios-nrpe-server restart":
-		path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-		refreshonly => true,
+		nagios-nrpe-server: ensure => installed;
 	}
 }
-
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: