X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Ftemplates%2Fobsolete-packages-ignore.d-hostspecific.erb;h=8e0de1efbebfaeabafc014c5c50e9d7097a9f6da;hb=4fd87c46d590f873f1953302a9ac069714fcafc1;hp=a0efa92e19cdaa47567086b5a4f424a6328d6463;hpb=4794ad3e9dedbdbced9e45566bb398ea63fc97e6;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 a0efa92e1..8e0de1efb 100644
--- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
+++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
@@ -5,32 +5,13 @@
 
 <%=
 ignore = []
-case fqdn
-when "cilea.debian.org" then                                   ignore << "/freeswitch.*/"
-when /draghi.debian.org/ then                                  ignore << %w{userdir-ldap userdir-ldap-cgi libheimdal-kadm5-perl django-ldapdb}
-when /orff.debian.org/ then                                    ignore << %w{libnet-dns-sec-perl libnet-dns-zone-parser-perl}
-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).debian.org/ then         ignore << "samhain"
-when "franck.debian.org" then                                  ignore << %w{python-apt}
-when /(abel|arnold|alain|alwyn|antheil|arne).debian.org/ then  ignore << %w{flash-kernel linux-firmware-image}
-when /harris.debian.org/ then                                  ignore << %w{flash-kernel kernel linux-firmware-image}
-when /(hasse|hebden|henze|hildegard|howells|hummel|hoiby).debian.org/ then ignore << %w{flash-kernel kernel linux-firmware-image}
-when /(parry|partch).debian.org/ then                          ignore << "yaboot"
-when "grieg.debian.org" then                                   ignore << %w{dpkg}
-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 /(pasquini|tristano).debian.org/ then                     ignore << %w{ganeti-instance-image}
-end
-
-case fqdn
-when /geo[123].debian.org/ then                    ignore << %w{geoip-database}
-end
-
-if fqdn == "arne.debian.org"
-    ignore << %w{/linux-headers-.*/}
+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 /(storace|backuphost).debian.org/ then                    ignore << %w{postgresql-client-9.6}
 end
 
 ignore.flatten.join("\n")