X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fnagios%2Ftemplates%2Fobsolete-packages-ignore.d-hostspecific.erb;h=d330721a64b051336f3adae354d52931ff759733;hb=9646415eaba9ce5d9f26563f35998d5436a94283;hp=2370463633f21d840bfe892300c09e4195ddf2b1;hpb=5f56d022312aa0e61e932a6d96207914d2910c34;p=dsa-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 23704636..d330721a 100644
--- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
+++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
@@ -8,31 +8,33 @@ 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|corelli).debian.org/: ignore << "linux-base"
-when /(peri|penalosa).debian.org/:      ignore << %w{linux-base debian.org-recommended}
+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}
 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|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 /(harris|hoiby).debian.org/:       ignore << %w{flash-kernel kernel linux-firmware-image}
+when /(hartmann|hasse|hebden|henze).debian.org/: ignore << %w{flash-kernel 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}
+when "handel.debian.org":               ignore << %w{puppet-dashboard}
+when /(pasquini|tristano).debian.org/:  ignore << %w{ganeti-instance-image}
 end
 
 case fqdn
 when /geo[123].debian.org/: ignore << %w{geoip-database}
 end
 
+if fqdn == "arne.debian.org"
+	ignore << %w{/linux-headers-.*/}
+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