X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Ftemplates%2Fobsolete-packages-ignore.d-hostspecific.erb;h=8f815826f041f26b23499d96ed6cdd84bc4dbf2f;hb=249b713a08d35bffb1cd52739be6f5808baa5a5f;hp=3705e9af7954ca20f80d36edb7caa131a294a44b;hpb=96999fa797b51d5701a6b32f23ffbf8be008fdfa;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 3705e9af7..8f815826f 100644
--- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
+++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
@@ -5,21 +5,19 @@
 
 <%=
 ignore = []
-case fqdn
-when /draghi.debian.org/ then                                  ignore << %w{userdir-ldap userdir-ldap-cgi libheimdal-kadm5-perl django-ldapdb ud python-cdb python-nameparser}
+case @fqdn
+when /draghi.debian.org/ then                                  ignore << %w{userdir-ldap userdir-ldap-cgi libheimdal-kadm5-perl django-ldapdb ud python-cdb python-nameparser python-django-ldapdb}
 when "handel.debian.org" then                                  ignore << %w{puppet-dashboard}
 when "reger.debian.org" then                                   ignore << %w{librt-extension-commandbymail-perl}
 when /(rainier|rapoport).debian.org/ then                      ignore << %w{rabbitmq-server}
-when "sibelius.debian.org" then                                ignore << %w{tivsm-ba tivsm-api64 gskssl64 gskcrypt64 tivsm-api gskssl gskcrypt}
-when "storace.debian.org" then                                 ignore << %w{postgresql-client-9.1}
+when "sibelius.debian.org" then                                ignore << %w{tivsm-ba tivsm-bacit tivsm-api64 gskssl64 gskcrypt64 tivsm-api tivsm-apicit gskssl gskcrypt}
+when /(storace|backuphost).debian.org/ then                    ignore << %w{postgresql-client-9.1}
 end
 
-case fqdn
-when /geo[123].debian.org/ then                    ignore << %w{geoip-database}
-end
-
-case fqdn
-when /((csail|grnet)-node(01|02)|powell|bm-bl1).debian.org/ then       ignore << %w{ganeti-os-noop}
+if @lsbmajdistrelease <= '8'
+  case @fqdn
+    when /(acker|aagaard).debian.org/ then                     ignore << %w{qemu-efi}
+  end
 end
 
 ignore.flatten.join("\n")