s/installed/latest/ for buildd software

[mirror/dsa-puppet.git] / modules / nagios / manifests / init.pp

diff --git a/modules/nagios/manifests/init.pp b/modules/nagios/manifests/init.pp
index 8517725..64502aa 100644 (file)
--- 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":