X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Ftemplates%2Fobsolete-packages-ignore.d-hostspecific.erb;h=963019b5b357b63806065c4f2e8f7dc3e6d5f090;hb=0e95fbdd080c4c7156bf2c4f938c0b85629a3981;hp=545d3914414d500d1560f0e1f0a979a3e5ad9027;hpb=29f0aa8acfc0b2ecdb414235a89c3d258964948e;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 545d39144..963019b5b 100644
--- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
+++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
@@ -5,33 +5,20 @@
 
 <%=
 ignore = []
-case fqdn
-when "bellini.debian.org":              ignore << "mcelog"
-when "cilea.debian.org":                ignore << "/freeswitch.*/"
-when /draghi.debian.org/:               ignore << %w{userdir-ldap libheimdal-kadm5-perl}
-when /orff.debian.org/:                 ignore << %w{libnet-dns-sec-perl libnet-dns-zone-parser-perl}
-when /liszt.debian.org/:                ignore << "amavisd-new"
-when "zelenka.debian.org":              ignore << %w{zabbix-agent rrdcollect}
-when "zandonai.debian.org":             ignore << %w{samhain zabbix-agent rrdcollect}
-when /(mayer|paer|peri|penalosa|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 "zee.debian.org":                  ignore << %w{dpkg-dev dpkg}
-when "grieg.debian.org":                ignore << %w{dpkg}
-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 puppet puppet-common kernel linux-firmware-image}
-when /(hartmann|hasse|hebden|henze).debian.org/: ignore << %w{flash-kernel puppet puppet-common kernel linux-firmware-image schroot schroot-common}
+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 "sibelius.debian.org" then                                ignore << %w{tivsm-ba tivsm-bacit tivsm-api64 gskssl64 gskcrypt64 tivsm-api tivsm-apicit gskssl gskcrypt}
+when /(storace|backuphost).debian.org/ then                    ignore << %w{postgresql-client-9.1 libssl1.0.0:amd64 postgresql-client-9.4}
 end
 
-case fqdn
-when /geo[123].debian.org/: ignore << %w{geoip-database}
+if scope.call_function('versioncmp', [@lsbmajdistrelease, '8']) <= 0
+  case @fqdn
+    when /(conova-node02|aagaard).debian.org/ then                     ignore << %w{qemu-efi}
+  end
 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")
 %>