X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Ftemplates%2Fobsolete-packages-ignore.d-hostspecific.erb;h=3a9425a1aa1ac883c4711d13961c1ef591af8b18;hb=0a60b0b9b1594abaeb921164d51455f5b7328382;hp=a26349c5364f8313a0360eba6de816bfd9ed4d8c;hpb=229cacd3a73bc970a18d6f510311c48ea37ddf4a;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 a26349c53..3a9425a1a 100644
--- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
+++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
@@ -11,20 +11,28 @@ 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 "grieg.debian.org":                ignore << %w{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 kernel linux-firmware-image}
+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}
 end
 
 case fqdn
 when /geo[123].debian.org/: ignore << %w{geoip-database}
 end
 
+if nodeinfo['ldap']['purpose'].include?('buildd')
+	ignore << %w{libsbuild-perl buildd-builder-meta}
+end
 #case fqdn
 #when /(draghi|orff|ravel|klecker|geo[123]).debian.org/: ignore << %w{libdns69 libdns66 libdns64 bind9 libbind9-60 liblwres60 bind9-host libisccfg62 libisccfg60 libisc62 libisc60 dnsutils bind9utils libisccc60}
 #end