Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

[mirror/dsa-puppet.git] / modules / nagios / templates / obsolete-packages-ignore.d-hostspecific.erb

diff --git a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
index f7ad3cf..117cbf8 100644 (file)
--- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
+++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
@@ -8,9 +8,8 @@ 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 "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 /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}
@@ -23,7 +22,7 @@ when "zee.debian.org":                  ignore << %w{dpkg-dev dpkg}
 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.flatten.join("\n")
 %>