X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Ftemplates%2Fobsolete-packages-ignore.d-hostspecific.erb;h=6a543eada9d01d935e4d7598077f7aaa7b63eaa8;hb=dfd79c4d4c6aa06b2a0a028586c4df176d75672b;hp=20dc66c6a23771b205b434f718d84adee64e314c;hpb=8874d85ca7ad6802d6f580ec6838adf420670d6d;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 20dc66c6a..6a543eada 100644
--- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
+++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
@@ -6,23 +6,28 @@
 <%=
 ignore = []
 case fqdn
-when /(bellini|cimarosa).debian.org/:   ignore << "mcelog"
+when "bellini.debian.org":              ignore << "mcelog"
 when "busoni.debian.org":               ignore << %w{libthreads-perl libthreads-shared-perl}
-when /draghi.debian.org/:               ignore << %w{userdir-ldap libnet-dns-perl libnet-dns-sec-perl libnet-dns-zone-parser-perl libdns-ruby1.8}
-when /geo[123].debian.org/:             ignore << %w{geoip-database libgeoip1 geoip-bin}
+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 /stabile.debian.org/:              ignore << "xfsprogs"
+when /stabile.debian.org/:              ignore << %w{xfsprogs postgresql-9.0-debversion}
+when /sibelius.debian.org/:             ignore << %w{postgresql-9.0 postgresql-9.0-debversion libpq5 postgresql-contrib-9.0 postgresql-client-9.0 postgresql-plperl-9.0}
 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 "/(ries|franck).debian.org/":      ignore << %w{apt-utils apt libapt-pkg-dev}
+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 /(abel|arnold|alain|alwyn|antheil|arne).debian.org/: ignore << %w{flash-kernel linux-firmware-image}
 end
 
 case fqdn
-when /(draghi|orff|ravel|klecker).debian.org/: ignore << %w{libdns64 bind9 libbind9-60 liblwres60 bind9-host libisccfg60 libisc60 dnsutils bind9utils libisccc60}
+when /(draghi|orff|ravel|klecker|geo[123]).debian.org/: ignore << %w{libdns66 libdns64 bind9 libbind9-60 liblwres60 bind9-host libisccfg60 libisc60 dnsutils bind9utils libisccc60}
 end
+
+ignore << '/openafs-modules-.*/'
 ignore.flatten.join("\n")
 %>