Move obsolete-packages-ignore file for dsa-check-packages into puppet

diff --git a/modules/nagios/files/common/obsolete-packages-ignore b/modules/nagios/files/common/obsolete-packages-ignore
new file mode 100644 (file)
index 0000000..7dd79e5
--- /dev/null
+++ b/modules/nagios/files/common/obsolete-packages-ignore
@@ -0,0 +1,4 @@
+/linux-image-.*/
+/kernel-image-.*/
+buildd
+sbuild

diff --git a/modules/nagios/files/per-host/zelenka.debian.org/obsolete-packages-ignore b/modules/nagios/files/per-host/zelenka.debian.org/obsolete-packages-ignore
new file mode 100644 (file)
index 0000000..c58f1f2
--- /dev/null
+++ b/modules/nagios/files/per-host/zelenka.debian.org/obsolete-packages-ignore
@@ -0,0 +1,11 @@
+/linux-image-.*/
+/kernel-image-.*/
+buildd
+sbuild
+
+zabbix-agent
+libgnutls13
+libldap2
+liblzo1
+libopencdk8
+librrd2

diff --git a/modules/nagios/manifests/init.pp b/modules/nagios/manifests/init.pp
index 20b733e527a3d22b9befa99db6876c5890853fbe..64502aac2ace8bcc3ff3c36f4a5516ee177dc267 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":