X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Ftemplates%2Fobsolete-packages-ignore.d-hostspecific.erb;h=854d3f55d5939196acfd3fd101a45108bdb6ebcd;hb=3d700b5d64e2518080c3b4d25be26b4158f1fc0b;hp=bc179b66aed96ea2acbbd9726deae4e5099da33d;hpb=702cc58597e40eddea72dee30810cb253606a978;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 bc179b66a..854d3f55d 100644
--- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
+++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
@@ -6,20 +6,23 @@
 <%=
 ignore = []
 case fqdn
-when /(bellini|cimarosa).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 /liszt.debian.org/:              ignore << "amavisd-new"
-when /stabile.debian.org/:            ignore << "xfsprogs"
-when /(zandonai|zelenka).debian.org/: ignore << %w{zabbix-agent rrdcollect}
+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 "powell.debian.org":             ignore << %w{e2fslibs e2fsprogs libblkid1 libcomerr2 libss2 libuuid1 uuid-runtime}
-when "zee.debian.org":                ignore << %w{dpkg-dev dpkg}
+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}
 end
 
 case fqdn
-when /(draghi|orff|ravel)/.debian.org: ignore << %w{libdns64 bind9 libbind9-60 liblwres60 bind9-host libisccfg60 libisc60 dnsutils bind9utils libisccc60}
+when /(draghi|orff|ravel|klecker).debian.org/: ignore << %w{libdns64 bind9 libbind9-60 liblwres60 bind9-host libisccfg60 libisc60 dnsutils bind9utils libisccc60}
 end
 ignore.flatten.join("\n")
 %>