X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Fmanifests%2Finit.pp;h=285f331456ba4b41ffefc608752b2bc81c12dcdd;hb=f22b772133304eaa5d992894f4aaccb6baeda890;hp=b59960433b3536e076623f57b45c6b707b9a194d;hpb=79111f6c27c9d0d877043a0516458d11dd16d8f6;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nagios/manifests/init.pp b/modules/nagios/manifests/init.pp
index b59960433..285f33145 100644
--- a/modules/nagios/manifests/init.pp
+++ b/modules/nagios/manifests/init.pp
@@ -1,6 +1,7 @@
-class nagiosclient {
+class nagios-client {
 	package {
 		nagios-nrpe-server: ensure => installed;
+		dsa-nagios-nrpe-config: ensure => purged;
 		dsa-nagios-checks: ensure => installed;
 	}
 
@@ -28,7 +29,7 @@ class nagiosclient {
 			notify  => Exec["nagios-nrpe-server restart"];
 		"/etc/nagios/nrpe.d/nrpe_dsa.cfg":
 			source  => [ "puppet:///nagios/dsa-nagios/generated/nrpe_dsa.cfg" ],
-			require => Package["nagios-nrpe-server"],
+			require => Package["dsa-nagios-checks"],
 			notify  => Exec["nagios-nrpe-server restart"];
 	}
 
@@ -38,3 +39,79 @@ class nagiosclient {
 	}
 }
 
+class nagios-server {
+	package {
+		nagios3: ensure => installed;
+		nagios-nrpe-plugin: ensure => installed;
+		nagios-plugins: ensure => installed;
+	}
+
+	file {
+		"/etc/nagios-plugins/config/local-dsa-checkcommands.cfg":
+			source  => [ "puppet:///nagios/dsa-nagios/static/checkcommands.cfg" ],
+			require => Package["nagios3"],
+			notify  => Exec["nagios3 reload"];
+
+		"/etc/nagios3/cgi.cfg":
+			source  => [ "puppet:///nagios/dsa-nagios/static/cgi.cfg" ],
+			require => Package["nagios3"],
+			notify  => Exec["nagios3 reload"];
+		"/etc/nagios3/nagios.cfg":
+			source  => [ "puppet:///nagios/dsa-nagios/static/nagios.cfg" ],
+			require => Package["nagios3"],
+			notify  => Exec["nagios3 reload"];
+
+		"/etc/nagios3/puppetconf.d/contacts.cfg":
+			source  => [ "puppet:///nagios/dsa-nagios/static/conf.d/contacts.cfg" ],
+			require => Package["nagios3"],
+			notify  => Exec["nagios3 reload"];
+		"/etc/nagios3/puppetconf.d/generic-host.cfg":
+			source  => [ "puppet:///nagios/dsa-nagios/static/conf.d/generic-host.cfg" ],
+			require => Package["nagios3"],
+			notify  => Exec["nagios3 reload"];
+		"/etc/nagios3/puppetconf.d/generic-service.cfg":
+			source  => [ "puppet:///nagios/dsa-nagios/static/conf.d/generic-service.cfg" ],
+			require => Package["nagios3"],
+			notify  => Exec["nagios3 reload"];
+		"/etc/nagios3/puppetconf.d/timeperiods.cfg":
+			source  => [ "puppet:///nagios/dsa-nagios/static/conf.d/timeperiods.cfg" ],
+			require => Package["nagios3"],
+			notify  => Exec["nagios3 reload"];
+
+		"/etc/nagios3/puppetconf.d/auto-dependencies.cfg":
+			source  => [ "puppet:///nagios/dsa-nagios/generated/auto-dependencies.cfg" ],
+			require => Package["nagios3"],
+			notify  => Exec["nagios3 reload"];
+		"/etc/nagios3/puppetconf.d/auto-hostextinfo.cfg":
+			source  => [ "puppet:///nagios/dsa-nagios/generated/auto-hostextinfo.cfg" ],
+			require => Package["nagios3"],
+			notify  => Exec["nagios3 reload"];
+		"/etc/nagios3/puppetconf.d/auto-hostgroups.cfg":
+			source  => [ "puppet:///nagios/dsa-nagios/generated/auto-hostgroups.cfg" ],
+			require => Package["nagios3"],
+			notify  => Exec["nagios3 reload"];
+		"/etc/nagios3/puppetconf.d/auto-hosts.cfg":
+			source  => [ "puppet:///nagios/dsa-nagios/generated/auto-hosts.cfg" ],
+			require => Package["nagios3"],
+			notify  => Exec["nagios3 reload"];
+		"/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg":
+			source  => [ "puppet:///nagios/dsa-nagios/generated/auto-serviceextinfo.cfg" ],
+			require => Package["nagios3"],
+			notify  => Exec["nagios3 reload"];
+		"/etc/nagios3/puppetconf.d/auto-servicesgroups.cfg":
+			source  => [ "puppet:///nagios/dsa-nagios/generated/auto-servicesgroups.cfg" ],
+			require => Package["nagios3"],
+			notify  => Exec["nagios3 reload"];
+		"/etc/nagios3/puppetconf.d/auto-services.cfg":
+			source  => [ "puppet:///nagios/dsa-nagios/generated/auto-services.cfg" ],
+			require => Package["nagios3"],
+			notify  => Exec["nagios3 reload"];
+
+	}
+
+	exec { "nagios3 reload":
+		path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+		refreshonly => true,
+	}
+}
+