From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 9 Jan 2010 12:13:00 +0000 (+0100)
Subject: Move all per-host obsolete-packages-ignore.d-hostspecific files into the template
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a62155499e7de389eb88cfe95df4a91a209ae483;p=dsa-puppet.git

Move all per-host obsolete-packages-ignore.d-hostspecific files into the template
---

diff --git a/modules/nagios/files/per-host/bellini.debian.org/obsolete-packages-ignore.d-hostspecific b/modules/nagios/files/per-host/bellini.debian.org/obsolete-packages-ignore.d-hostspecific
deleted file mode 100644
index a6f0a045..00000000
--- a/modules/nagios/files/per-host/bellini.debian.org/obsolete-packages-ignore.d-hostspecific
+++ /dev/null
@@ -1,6 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-mcelog
diff --git a/modules/nagios/files/per-host/cimarosa.debian.org/obsolete-packages-ignore.d-hostspecific b/modules/nagios/files/per-host/cimarosa.debian.org/obsolete-packages-ignore.d-hostspecific
deleted file mode 100644
index a6f0a045..00000000
--- a/modules/nagios/files/per-host/cimarosa.debian.org/obsolete-packages-ignore.d-hostspecific
+++ /dev/null
@@ -1,6 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-mcelog
diff --git a/modules/nagios/files/per-host/draghi.debian.org/obsolete-packages-ignore.d-hostspecific b/modules/nagios/files/per-host/draghi.debian.org/obsolete-packages-ignore.d-hostspecific
deleted file mode 100644
index 77890c1e..00000000
--- a/modules/nagios/files/per-host/draghi.debian.org/obsolete-packages-ignore.d-hostspecific
+++ /dev/null
@@ -1,6 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-userdir-ldap
diff --git a/modules/nagios/files/per-host/geo1.debian.org/obsolete-packages-ignore.d-hostspecific b/modules/nagios/files/per-host/geo1.debian.org/obsolete-packages-ignore.d-hostspecific
deleted file mode 100644
index 19e0ccfd..00000000
--- a/modules/nagios/files/per-host/geo1.debian.org/obsolete-packages-ignore.d-hostspecific
+++ /dev/null
@@ -1,8 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-geoip-database
-libgeoip1
-geoip-bin
diff --git a/modules/nagios/files/per-host/geo2.debian.org/obsolete-packages-ignore.d-hostspecific b/modules/nagios/files/per-host/geo2.debian.org/obsolete-packages-ignore.d-hostspecific
deleted file mode 100644
index 19e0ccfd..00000000
--- a/modules/nagios/files/per-host/geo2.debian.org/obsolete-packages-ignore.d-hostspecific
+++ /dev/null
@@ -1,8 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-geoip-database
-libgeoip1
-geoip-bin
diff --git a/modules/nagios/files/per-host/geo3.debian.org/obsolete-packages-ignore.d-hostspecific b/modules/nagios/files/per-host/geo3.debian.org/obsolete-packages-ignore.d-hostspecific
deleted file mode 100644
index 19e0ccfd..00000000
--- a/modules/nagios/files/per-host/geo3.debian.org/obsolete-packages-ignore.d-hostspecific
+++ /dev/null
@@ -1,8 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-geoip-database
-libgeoip1
-geoip-bin
diff --git a/modules/nagios/files/per-host/liszt.debian.org/obsolete-packages-ignore.d-hostspecific b/modules/nagios/files/per-host/liszt.debian.org/obsolete-packages-ignore.d-hostspecific
deleted file mode 100644
index bfc2f3b1..00000000
--- a/modules/nagios/files/per-host/liszt.debian.org/obsolete-packages-ignore.d-hostspecific
+++ /dev/null
@@ -1,6 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-amavisd-new
diff --git a/modules/nagios/files/per-host/penalosa.debian.org/obsolete-packages-ignore.d-hostspecific b/modules/nagios/files/per-host/penalosa.debian.org/obsolete-packages-ignore.d-hostspecific
deleted file mode 100644
index 79e7bec1..00000000
--- a/modules/nagios/files/per-host/penalosa.debian.org/obsolete-packages-ignore.d-hostspecific
+++ /dev/null
@@ -1,7 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-libvolume-id0
-udev
diff --git a/modules/nagios/files/per-host/peri.debian.org/obsolete-packages-ignore.d-hostspecific b/modules/nagios/files/per-host/peri.debian.org/obsolete-packages-ignore.d-hostspecific
deleted file mode 100644
index 79e7bec1..00000000
--- a/modules/nagios/files/per-host/peri.debian.org/obsolete-packages-ignore.d-hostspecific
+++ /dev/null
@@ -1,7 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-libvolume-id0
-udev
diff --git a/modules/nagios/files/per-host/stabile.debian.org/obsolete-packages-ignore.d-hostspecific b/modules/nagios/files/per-host/stabile.debian.org/obsolete-packages-ignore.d-hostspecific
deleted file mode 100644
index 4bede3e0..00000000
--- a/modules/nagios/files/per-host/stabile.debian.org/obsolete-packages-ignore.d-hostspecific
+++ /dev/null
@@ -1,6 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-xfsprogs
diff --git a/modules/nagios/files/per-host/zelenka.debian.org/obsolete-packages-ignore.d-hostspecific b/modules/nagios/files/per-host/zelenka.debian.org/obsolete-packages-ignore.d-hostspecific
deleted file mode 100644
index 330e9eec..00000000
--- a/modules/nagios/files/per-host/zelenka.debian.org/obsolete-packages-ignore.d-hostspecific
+++ /dev/null
@@ -1,7 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-zabbix-agent
-rrdcollect
diff --git a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
index 196f1833..a4df36ab 100644
--- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
+++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
@@ -4,3 +4,16 @@
 ##
 
 # this fine intentially kept empty
+<%=
+ignore = []
+case fqdn
+when /(bellini|cimarosa).debian.org/: ignore << "mcelog"
+when /draghi.debian.org/:             ignore << "userdir-ldap"
+when /geo[123].debian.org/:           ignore << %w{geoip-database libgeoip1 geoip-bin}
+when /liszt.debian.org/:              ignore << "amavisd-new"
+when /stabile.debian.org/:            ignore << "xfsprogs"
+when /(zandonai|zelenka).debian.org/: ignore << %w{zabbix-agent rrdcollect}
+end
+
+ignore.flatten.join("\n")
+%>