X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fnagios%2Ftemplates%2Fobsolete-packages-ignore.d-hostspecific.erb;h=32f4f1d61e666876cb9a5787e2d6ff39784d6c7f;hb=19be01c1fc6e2c4db1a41df686cd60889c10f179;hp=c2d7e9eef5da7eabe65e85cbf0092ba82ab939a8;hpb=4f81eb9ecb1b401c3e67d01129f2ef1f06da4f30;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
index c2d7e9eef..32f4f1d61 100644
--- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
+++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
@@ -5,35 +5,13 @@
 
 <%=
 ignore = []
-case fqdn
-when /draghi.debian.org/ then                                  ignore << %w{userdir-ldap userdir-ldap-cgi libheimdal-kadm5-perl django-ldapdb ud python-cdb python-nameparser}
-when /(zandonai|zelenka).debian.org/ then                      ignore << %w{samhain zabbix-agent rrdcollect}
-when /zappa.debian.org/ then                                   ignore << %w{samhain}
-when /(mayer|corelli).debian.org/ then                         ignore << "linux-base"
-when /(alkman|caballero|merulo|mundy|zani).debian.org/ then    ignore << "samhain"
-when "franck.debian.org" then                                  ignore << %w{python-apt}
-when /(abel|arnold|antheil).debian.org/ then  ignore << %w{flash-kernel linux-firmware-image}
-when /harris.debian.org/ then                                  ignore << %w{flash-kernel kernel linux-firmware-image}
-when /(hartmann|hasse|henze|howells|hummel|hoiby).debian.org/ then ignore << %w{flash-kernel kernel linux-firmware-image}
-when /(parry|partch).debian.org/ then                          ignore << "yaboot"
-when "blavet.debian.org" then                                  ignore << %w{dpkg-dev libdpkg-perl dpkg}
+case @fqdn
+when /draghi.debian.org/ then                                  ignore << %w{userdir-ldap userdir-ldap-cgi libheimdal-kadm5-perl django-ldapdb ud python-cdb python-nameparser python-django-ldapdb}
 when "handel.debian.org" then                                  ignore << %w{puppet-dashboard}
 when "reger.debian.org" then                                   ignore << %w{librt-extension-commandbymail-perl}
-when /(rainier|rapoport).debian.org/ then                      ignore << %w{rabbitmq-server}
-when /(pasquini|tristano).debian.org/ then                     ignore << %w{ganeti-instance-image}
-when "zemlinsky.debian.org" then                               ignore << %w{initramfs-tools}
-when "sibelius.debian.org" then                                ignore << %w{tivsm-ba tivsm-api64 gskssl64 gskcrypt64}
-when "vogler.debian.org" then                                  ignore << %w{repro libresiprocate-1.9 resiprocate-turn-server}
-when /(mailly|muffat).debian.org/ then                         ignore << %w{python-dsa-mq}
-when /(csail|grnet)-node(01|02).debian.org/ then               ignore << %w{openvswitch-switch openvswitch-common}
-end
-
-case fqdn
-when /geo[123].debian.org/ then                    ignore << %w{geoip-database}
-end
-
-case fqdn
-when /((csail|grnet)-node(01|02)|powell|bm-bl1).debian.org/ then       ignore << %w{ganeti-os-noop}
+when "sibelius.debian.org" then                                ignore << %w{tivsm-ba tivsm-bacit tivsm-api64 gskssl64 gskcrypt64 tivsm-api tivsm-apicit gskssl gskcrypt}
+when /(sallinen|lw07).debian.org/ then                         ignore << %w{ruby-dbi ruby-deprecated ruby-dbd-pg}
+when /ubc-node-arm(01|02|03).debian.org/ then                  ignore << %w{qemu-efi-arm}
 end
 
 ignore.flatten.join("\n")