X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Ftemplates%2Fobsolete-packages-ignore.d-hostspecific.erb;h=3705e9af7954ca20f80d36edb7caa131a294a44b;hb=96999fa797b51d5701a6b32f23ffbf8be008fdfa;hp=d8031b775fdb2f92331edeaafd43312088b7efa8;hpb=5c81e6ccf114f952745c458b86174a1b72e0e634;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 d8031b775..3705e9af7 100644
--- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
+++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
@@ -6,22 +6,21 @@
 <%=
 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 /(dijkstra|unger|luchesi|schumann).debian.org/: ignore << "qemu-kvm"
-when /(lebrun|schroeder).debian.org/: ignore << "firmware-linux-nonfree"
-when /(peri|penalosa).debian.org/:    ignore << "linux-base"
-when "powell.debian.org":             ignore << %w{e2fslibs e2fsprogs libblkid1 libcomerr2 libss2 libuuid1 uuid-runtime}
-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}
+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-api64 gskssl64 gskcrypt64 tivsm-api gskssl gskcrypt}
+when "storace.debian.org" then                                 ignore << %w{postgresql-client-9.1}
 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 /geo[123].debian.org/ then                    ignore << %w{geoip-database}
 end
+
+case fqdn
+when /((csail|grnet)-node(01|02)|powell|bm-bl1).debian.org/ then       ignore << %w{ganeti-os-noop}
+end
+
 ignore.flatten.join("\n")
 %>