X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Ftemplates%2Fobsolete-packages-ignore.d-hostspecific.erb;h=243fa4791d89251f34b6c03dc18c72c42cacbefb;hb=24409d094a53a1ef3c4abeaf707541a00c24f800;hp=2e88293cfb57a502e17181b66273587c9678c375;hpb=6807192ed47736bb4b6a4449ad4a0e0f2d167e09;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 2e88293cf..243fa4791 100644
--- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
+++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
@@ -11,14 +11,22 @@ 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 /(zandonai|zelenka).debian.org/:   ignore << %w{zabbix-agent rrdcollect}
+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 /(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}
 when "franck.debian.org":               ignore << %w{python-apt}
 when "zee.debian.org":                  ignore << %w{dpkg-dev dpkg}
 when /(abel|arnold|alain|alwyn|antheil|arne).debian.org/: ignore << %w{flash-kernel linux-firmware-image}
-when /(harris|hartmann|hasse|hebden|henze|hoiby).debian.org/: ignore << %w{flash-kernel puppet puppet-common}
+when /(harris|hoiby).debian.org/:       ignore << %w{flash-kernel puppet puppet-common kernel linux-firmware-image}
+when /(hartmann|hasse|hebden|henze).debian.org/: ignore << %w{flash-kernel puppet puppet-common kernel linux-firmware-image schroot schroot-common}
+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}
 end
 
 case fqdn