From: Stephen Gran <steve@lobefin.net>
Date: Wed, 18 Apr 2012 05:32:23 +0000 (+0100)
Subject: clean up some ignores
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=95eeea5e6237fa87aa40acbe95db43bdec825d32;p=mirror%2Fdsa-puppet.git

clean up some ignores

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
index 2ed222d34..dcd480c9d 100644
--- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
+++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
@@ -11,9 +11,8 @@ 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 "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 /(zandonai|zelenka).debian.org/:   ignore << %w{samhain zabbix-agent rrdcollect}
+when /(zappa|zemlinsky).debian.org/:    ignore << %w{samhain}
 when /(mayer|paer|peri|penalosa|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}