Move all per-host obsolete-packages-ignore.d-hostspecific files into the template

diff --git a/modules/nagios/files/per-host/bellini.debian.org/obsolete-packages-ignore.d-hostspecific b/modules/nagios/files/per-host/bellini.debian.org/obsolete-packages-ignore.d-hostspecific
deleted file mode 100644 (file)
index a6f0a04..0000000
--- a/modules/nagios/files/per-host/bellini.debian.org/obsolete-packages-ignore.d-hostspecific
+++ /dev/null
@@ -1,6 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-mcelog

diff --git a/modules/nagios/files/per-host/cimarosa.debian.org/obsolete-packages-ignore.d-hostspecific b/modules/nagios/files/per-host/cimarosa.debian.org/obsolete-packages-ignore.d-hostspecific
deleted file mode 100644 (file)
index a6f0a04..0000000
--- a/modules/nagios/files/per-host/cimarosa.debian.org/obsolete-packages-ignore.d-hostspecific
+++ /dev/null
@@ -1,6 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-mcelog

diff --git a/modules/nagios/files/per-host/draghi.debian.org/obsolete-packages-ignore.d-hostspecific b/modules/nagios/files/per-host/draghi.debian.org/obsolete-packages-ignore.d-hostspecific
deleted file mode 100644 (file)
index 77890c1..0000000
--- a/modules/nagios/files/per-host/draghi.debian.org/obsolete-packages-ignore.d-hostspecific
+++ /dev/null
@@ -1,6 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-userdir-ldap

diff --git a/modules/nagios/files/per-host/geo1.debian.org/obsolete-packages-ignore.d-hostspecific b/modules/nagios/files/per-host/geo1.debian.org/obsolete-packages-ignore.d-hostspecific
deleted file mode 100644 (file)
index 19e0ccf..0000000
--- a/modules/nagios/files/per-host/geo1.debian.org/obsolete-packages-ignore.d-hostspecific
+++ /dev/null
@@ -1,8 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-geoip-database
-libgeoip1
-geoip-bin

diff --git a/modules/nagios/files/per-host/geo2.debian.org/obsolete-packages-ignore.d-hostspecific b/modules/nagios/files/per-host/geo2.debian.org/obsolete-packages-ignore.d-hostspecific
deleted file mode 100644 (file)
index 19e0ccf..0000000
--- a/modules/nagios/files/per-host/geo2.debian.org/obsolete-packages-ignore.d-hostspecific
+++ /dev/null
@@ -1,8 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-geoip-database
-libgeoip1
-geoip-bin

diff --git a/modules/nagios/files/per-host/geo3.debian.org/obsolete-packages-ignore.d-hostspecific b/modules/nagios/files/per-host/geo3.debian.org/obsolete-packages-ignore.d-hostspecific
deleted file mode 100644 (file)
index 19e0ccf..0000000
--- a/modules/nagios/files/per-host/geo3.debian.org/obsolete-packages-ignore.d-hostspecific
+++ /dev/null
@@ -1,8 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-geoip-database
-libgeoip1
-geoip-bin

diff --git a/modules/nagios/files/per-host/liszt.debian.org/obsolete-packages-ignore.d-hostspecific b/modules/nagios/files/per-host/liszt.debian.org/obsolete-packages-ignore.d-hostspecific
deleted file mode 100644 (file)
index bfc2f3b..0000000
--- a/modules/nagios/files/per-host/liszt.debian.org/obsolete-packages-ignore.d-hostspecific
+++ /dev/null
@@ -1,6 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-amavisd-new

diff --git a/modules/nagios/files/per-host/penalosa.debian.org/obsolete-packages-ignore.d-hostspecific b/modules/nagios/files/per-host/penalosa.debian.org/obsolete-packages-ignore.d-hostspecific
deleted file mode 100644 (file)
index 79e7bec..0000000
--- a/modules/nagios/files/per-host/penalosa.debian.org/obsolete-packages-ignore.d-hostspecific
+++ /dev/null
@@ -1,7 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-libvolume-id0
-udev

diff --git a/modules/nagios/files/per-host/peri.debian.org/obsolete-packages-ignore.d-hostspecific b/modules/nagios/files/per-host/peri.debian.org/obsolete-packages-ignore.d-hostspecific
deleted file mode 100644 (file)
index 79e7bec..0000000
--- a/modules/nagios/files/per-host/peri.debian.org/obsolete-packages-ignore.d-hostspecific
+++ /dev/null
@@ -1,7 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-libvolume-id0
-udev

diff --git a/modules/nagios/files/per-host/stabile.debian.org/obsolete-packages-ignore.d-hostspecific b/modules/nagios/files/per-host/stabile.debian.org/obsolete-packages-ignore.d-hostspecific
deleted file mode 100644 (file)
index 4bede3e..0000000
--- a/modules/nagios/files/per-host/stabile.debian.org/obsolete-packages-ignore.d-hostspecific
+++ /dev/null
@@ -1,6 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-xfsprogs

diff --git a/modules/nagios/files/per-host/zelenka.debian.org/obsolete-packages-ignore.d-hostspecific b/modules/nagios/files/per-host/zelenka.debian.org/obsolete-packages-ignore.d-hostspecific
deleted file mode 100644 (file)
index 330e9ee..0000000
--- a/modules/nagios/files/per-host/zelenka.debian.org/obsolete-packages-ignore.d-hostspecific
+++ /dev/null
@@ -1,7 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-zabbix-agent
-rrdcollect

diff --git a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
index 196f1833d9eb538bce34a22c0d7d77740e417efb..a4df36ab089e03ec504729ab6aeece1d9a0bfc1e 100644 (file)
--- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
+++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
@@ -4,3 +4,16 @@
 ##
 
 # this fine intentially kept empty
+<%=
+ignore = []
+case fqdn
+when /(bellini|cimarosa).debian.org/: ignore << "mcelog"
+when /draghi.debian.org/:             ignore << "userdir-ldap"
+when /geo[123].debian.org/:           ignore << %w{geoip-database libgeoip1 geoip-bin}
+when /liszt.debian.org/:              ignore << "amavisd-new"
+when /stabile.debian.org/:            ignore << "xfsprogs"
+when /(zandonai|zelenka).debian.org/: ignore << %w{zabbix-agent rrdcollect}
+end
+
+ignore.flatten.join("\n")
+%>