X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Ftemplates%2Fobsolete-packages-ignore.d-hostspecific.erb;h=f307ec6effb624bf3121a40bb414406ffea801b7;hb=d55193d32bcface5935ae2a6acc2cdc6eed71a80;hp=117cbf89380061807fe8dbc8361bd634d021b995;hpb=5f9b6e60800eeff29318662b84404dc0d23283dc;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 117cbf893..f307ec6ef 100644
--- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
+++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
@@ -6,23 +6,19 @@
 <%=
 ignore = []
 case fqdn
-when /(bellini|cimarosa).debian.org/:   ignore << "mcelog"
-when "busoni.debian.org":               ignore << %w{libthreads-perl libthreads-shared-perl}
-when "cilea.debian.org":                ignore << "/freeswitch.*/"
-when /draghi.debian.org/:               ignore << %w{userdir-ldap libnet-dns-perl libnet-dns-sec-perl libnet-dns-zone-parser-perl libdns-ruby1.8}
-when /liszt.debian.org/:                ignore << "amavisd-new"
-when /stabile.debian.org/:              ignore << "xfsprogs"
-when /(zandonai|zelenka).debian.org/:   ignore << %w{zabbix-agent rrdcollect}
-when /(dijkstra|unger|luchesi|schumann).debian.org/: ignore << "qemu-kvm"
-when /(lebrun|schroeder).debian.org/:   ignore << "firmware-linux-nonfree"
-when /(mayer|paer|peri|penalosa).debian.org/: ignore << "linux-base"
-when "powell.debian.org":               ignore << %w{e2fslibs e2fsprogs libblkid1 libcomerr2 libss2 libuuid1 uuid-runtime}
-when "franck.debian.org":               ignore << %w{libuuid1 util-linux libcomerr2 libss2 e2fslibs uuid-runtime hpacucli e2fsprogs firmware-bnx2 libblkid1}
-when "zee.debian.org":                  ignore << %w{dpkg-dev dpkg}
+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}
 end
 
-case fqdn
-when /(draghi|orff|ravel|klecker|geo[123]).debian.org/: ignore << %w{libdns66 libdns64 bind9 libbind9-60 liblwres60 bind9-host libisccfg60 libisc60 dnsutils bind9utils libisccc60}
+if @lsbmajdistrelease <= '8'
+  case fqdn
+    when /(acker|aagaard).debian.org/ then                     ignore << %w{qemu-efi}
+  end
 end
+
 ignore.flatten.join("\n")
 %>