X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fnagios%2Ftemplates%2Fobsolete-packages-ignore.d-hostspecific.erb;h=1a81050324a09ee80b3b063a3576bd524175cf52;hb=77a6eae95d63ba4cf0125efc5f464dda3de0cf07;hp=2ed222d3451e917a78650f7c6e375e37327389c8;hpb=cf99c8402a73124f195ef1a5c9e1024148bfe999;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 2ed222d34..1a8105032 100644
--- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
+++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
@@ -8,13 +8,11 @@ ignore = []
 case fqdn
 when "bellini.debian.org":              ignore << "mcelog"
 when "cilea.debian.org":                ignore << "/freeswitch.*/"
-when /draghi.debian.org/:               ignore << %w{userdir-ldap libheimdal-kadm5-perl}
+when /draghi.debian.org/:               ignore << %w{userdir-ldap userdir-ldap-cgi 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 "zelenka.debian.org":              ignore << %w{zabbix-agent rrdcollect}
-when "zandonai.debian.org":             ignore << %w{samhain zabbix-agent rrdcollect}
-when "zemlinsky.debian.org":            ignore << %w{samhain}
-when /(mayer|paer|peri|penalosa|corelli).debian.org/: ignore << "linux-base"
+when /(zandonai|zelenka).debian.org/:   ignore << %w{samhain zabbix-agent rrdcollect}
+when /(zappa|zemlinsky).debian.org/:    ignore << %w{samhain}
+when /(mayer|corelli).debian.org/: ignore << "linux-base"
 when /(alkman|caballero|merulo|mundy).debian.org/: ignore << "samhain"
 when "powell.debian.org":               ignore << %w{e2fslibs e2fsprogs libblkid1 libcomerr2 libss2 libuuid1 uuid-runtime}
 when "rossini.debian.org":              ignore << %w{ganeti2}
@@ -27,6 +25,7 @@ when /(parry|partch|piston).debian.org/: ignore << "yaboot"
 when "grieg.debian.org":                ignore << %w{dpkg}
 when "blavet.debian.org":               ignore << %w{dpkg-dev libdpkg-perl dpkg}
 when "handel.debian.org":               ignore << %w{puppet-dashboard}
+when /(pasquini|tristano).debian.org/:  ignore << %w{ganeti-instance-image}
 end
 
 case fqdn