X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Fmanifests%2Finit.pp;h=64502aac2ace8bcc3ff3c36f4a5516ee177dc267;hb=f9ed123686bf8d2cdbb796a2584b38bbcd15bd34;hp=6e02543867a572468f31817c6ab15bbe7744ebf4;hpb=739699109498ffa09301e2e62239acd1cc25a7c1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nagios/manifests/init.pp b/modules/nagios/manifests/init.pp
index 6e0254386..64502aac2 100644
--- a/modules/nagios/manifests/init.pp
+++ b/modules/nagios/manifests/init.pp
@@ -29,8 +29,13 @@ class nagios-client {
 			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"];
+
+		"/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"];
 	}
 
 	exec { "nagios-nrpe-server restart":
@@ -39,3 +44,84 @@ class nagios-client {
 	}
 }
 
+class nagios-server {
+	package {
+		nagios3: ensure => installed;
+		nagios-nrpe-plugin: ensure => installed;
+		nagios-plugins: ensure => installed;
+		nagios-images: 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":
+			mode    => 755,
+			ensure  => directory;
+
+		"/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-servicegroups.cfg":
+			source  => [ "puppet:///nagios/dsa-nagios/generated/auto-servicegroups.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,
+	}
+}
+