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

diff --git a/modules/nagios/manifests/init.pp b/modules/nagios/manifests/init.pp
index 851772550..64502aac2 100644
--- a/modules/nagios/manifests/init.pp
+++ b/modules/nagios/manifests/init.pp
@@ -31,6 +31,11 @@ class nagios-client {
 			source  => [ "puppet:///nagios/dsa-nagios/generated/nrpe_dsa.cfg" ],
 			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":
@@ -44,6 +49,7 @@ class nagios-server {
 		nagios3: ensure => installed;
 		nagios-nrpe-plugin: ensure => installed;
 		nagios-plugins: ensure => installed;
+		nagios-images: ensure => installed;
 	}
 
 	file {
@@ -102,8 +108,8 @@ class nagios-server {
 			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" ],
+		"/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":