Merge branch 'master' into staging

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 1425ae2..fd0be86 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -76,10 +76,12 @@ nameinfo:
   widor.debian.org: Charles-Marie Jean Albert Widor (February 21, 1844 - March 12, 1937)
   wieck.debian.org: Clara Josephine Wieck (September 13, 1819 - May 20, 1896)
   wolkenstein.debian.org: Oswald von Wolkenstein (1377 - August 2nd, 1445)
+  zandonai.debian.org: Riccardo Zandonai (May 30th, 1883 - June 5th, 1944)
   zelenka.debian.org: Jan Dismas Zelenka (16 October 1679 - 23 December 1745)
 footer:
   lebrun.debian.org: "- This host is using an iptables firewall.  See /etc/rc.boot/firewall{,6}"
   schroeder.debian.org: "- This host is using an iptables firewall.  See /etc/rc.boot/firewall{,6}"
+  zandonai.debian.org: "Debian s390 buildd system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]"
   zelenka.debian.org: "Debian s390 porter system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]"
 services:
   bugsmaster:
@@ -219,6 +221,7 @@ host_settings:
     wieck.debian.org: mailout.debian.org
     wolkenstein.debian.org: mailout.debian.org
     zee.debian.org: mailout.debian.org
+    zandonai.debian.org: mailout.debian.org
     zelenka.debian.org: mailout.debian.org
   mail_port:
     ancina.debian.org: 2025

diff --git a/modules/nagios/files/common/obsolete-packages-ignore.d-hostspecific b/modules/nagios/files/common/obsolete-packages-ignore.d-hostspecific
deleted file mode 100644 (file)
index 196f183..0000000
--- a/modules/nagios/files/common/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
-##
-
-# this fine intentially kept empty

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 (file)
index a6f0a04..0000000
--- 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 (file)
index a6f0a04..0000000
--- 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 (file)
index 77890c1..0000000
--- 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 (file)
index 19e0ccf..0000000
--- 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 (file)
index 19e0ccf..0000000
--- 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 (file)
index 19e0ccf..0000000
--- 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 (file)
index bfc2f3b..0000000
--- 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 (file)
index 79e7bec..0000000
--- 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 (file)
index 79e7bec..0000000
--- 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 (file)
index 4bede3e..0000000
--- 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 (file)
index 330e9ee..0000000
--- 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/manifests/client.pp b/modules/nagios/manifests/client.pp
index 5a79944..285fdfc 100644 (file)
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -37,8 +37,7 @@ class nagios::client inherits nagios {
                        require => Package["dsa-nagios-checks"];
 
                "/etc/nagios/obsolete-packages-ignore.d/hostspecific":
-                       source  => [ "puppet:///nagios/per-host/$fqdn/obsolete-packages-ignore.d-hostspecific",
-                                    "puppet:///nagios/common/obsolete-packages-ignore.d-hostspecific" ],
+                        content => template("nagios/obsolete-packages-ignore.d-hostspecific.erb"),
                        require => Package["dsa-nagios-checks"];
        }
 

diff --git a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
new file mode 100644 (file)
index 0000000..e2b3e5d
--- /dev/null
+++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
@@ -0,0 +1,19 @@
+##
+## 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
+##
+
+<%=
+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}
+when /(dijkstra|unger|luchesi|schumann).debian.org/: ignore << "qemu-kvm"
+end
+
+ignore.flatten.join("\n")
+%>