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=29cbe59430d1e7d7d5575579b48513c56227e2f7;hp=bbcb0dec4d09e996a81a45f5832477ce712b5c42;hpb=dd36d465edaaa451d369a3b3bda35e67b0a7e76c;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 bbcb0dec4..8e0de1efb 100644
--- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
+++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
@@ -5,39 +5,14 @@
 
 <%=
 ignore = []
-case fqdn
-when "bellini.debian.org":              ignore << "mcelog"
-when "cilea.debian.org":                ignore << "/freeswitch.*/"
-when /draghi.debian.org/:               ignore << %w{userdir-ldap userdir-ldap-cgi libheimdal-kadm5-perl django-ldapdb}
-when /orff.debian.org/:                 ignore << %w{libnet-dns-sec-perl libnet-dns-zone-parser-perl}
-when /(zandonai|zelenka).debian.org/:   ignore << %w{samhain zabbix-agent rrdcollect}
-when /(zappa|zemlinsky).debian.org/:    ignore << %w{samhain}
-when /(mayer|corelli).debian.org/: ignore << "linux-base"
-when /(alkman|caballero|merulo|mundy).debian.org/: ignore << "samhain"
-when "powell.debian.org":               ignore << %w{e2fslibs e2fsprogs libblkid1 libcomerr2 libss2 libuuid1 uuid-runtime}
-when "rossini.debian.org":              ignore << %w{ganeti2}
-when "franck.debian.org":               ignore << %w{python-apt}
-when /(abel|arnold|alain|alwyn|antheil|arne).debian.org/: ignore << %w{flash-kernel linux-firmware-image}
-when /(harris|hoiby).debian.org/:       ignore << %w{flash-kernel kernel linux-firmware-image}
-when /(hasse|hebden|henze).debian.org/: ignore << %w{flash-kernel kernel linux-firmware-image schroot schroot-common}
-when /(parry|partch|piston).debian.org/: ignore << "yaboot"
-
-when "grieg.debian.org":                ignore << %w{dpkg}
-when "blavet.debian.org":               ignore << %w{dpkg-dev libdpkg-perl dpkg}
-when "handel.debian.org":               ignore << %w{puppet-dashboard}
-when /(pasquini|tristano).debian.org/:  ignore << %w{ganeti-instance-image}
-end
-
-case fqdn
-when /geo[123].debian.org/: ignore << %w{geoip-database}
-end
-
-if fqdn == "arne.debian.org"
-	ignore << %w{/linux-headers-.*/}
+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 "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
-#case fqdn
-#when /(draghi|orff|ravel|klecker|geo[123]).debian.org/: ignore << %w{libdns69 libdns66 libdns64 bind9 libbind9-60 liblwres60 bind9-host libisccfg62 libisccfg60 libisc62 libisc60 dnsutils bind9utils libisccc60}
-#end
 
 ignore.flatten.join("\n")
 %>