s/perhost/hostspecific/

diff --git a/modules/nagios/files/common/obsolete-packages-ignore.d-hostspecific b/modules/nagios/files/common/obsolete-packages-ignore.d-hostspecific
new file mode 100644 (file)
index 0000000..196f183
--- /dev/null
+++ b/modules/nagios/files/common/obsolete-packages-ignore.d-hostspecific
@@ -0,0 +1,6 @@
+##
+## 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/common/obsolete-packages-ignore.d-perhost b/modules/nagios/files/common/obsolete-packages-ignore.d-perhost
deleted file mode 100644 (file)
index 196f183..0000000
--- a/modules/nagios/files/common/obsolete-packages-ignore.d-perhost
+++ /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/liszt.debian.org/obsolete-packages-ignore.d-hostspecific b/modules/nagios/files/per-host/liszt.debian.org/obsolete-packages-ignore.d-hostspecific
new file mode 100644 (file)
index 0000000..bfc2f3b
--- /dev/null
+++ b/modules/nagios/files/per-host/liszt.debian.org/obsolete-packages-ignore.d-hostspecific
@@ -0,0 +1,6 @@
+##
+## 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/liszt.debian.org/obsolete-packages-ignore.d-perhost b/modules/nagios/files/per-host/liszt.debian.org/obsolete-packages-ignore.d-perhost
deleted file mode 100644 (file)
index bfc2f3b..0000000
--- a/modules/nagios/files/per-host/liszt.debian.org/obsolete-packages-ignore.d-perhost
+++ /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/samosa.debian.org/obsolete-packages-ignore.d-hostspecific b/modules/nagios/files/per-host/samosa.debian.org/obsolete-packages-ignore.d-hostspecific
new file mode 100644 (file)
index 0000000..13d91f6
--- /dev/null
+++ b/modules/nagios/files/per-host/samosa.debian.org/obsolete-packages-ignore.d-hostspecific
@@ -0,0 +1,13 @@
+##
+## 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
+##
+
+postgresql-client-common
+postgresql-client-8.4
+postgresql-server-dev-8.4
+postgresql-8.4
+libpq5
+postgresql-common
+libpq-dev
+postgresql-8.4-debversion

diff --git a/modules/nagios/files/per-host/samosa.debian.org/obsolete-packages-ignore.d-perhost b/modules/nagios/files/per-host/samosa.debian.org/obsolete-packages-ignore.d-perhost
deleted file mode 100644 (file)
index 13d91f6..0000000
--- a/modules/nagios/files/per-host/samosa.debian.org/obsolete-packages-ignore.d-perhost
+++ /dev/null
@@ -1,13 +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
-##
-
-postgresql-client-common
-postgresql-client-8.4
-postgresql-server-dev-8.4
-postgresql-8.4
-libpq5
-postgresql-common
-libpq-dev
-postgresql-8.4-debversion

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
new file mode 100644 (file)
index 0000000..4bede3e
--- /dev/null
+++ b/modules/nagios/files/per-host/stabile.debian.org/obsolete-packages-ignore.d-hostspecific
@@ -0,0 +1,6 @@
+##
+## 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/stabile.debian.org/obsolete-packages-ignore.d-perhost b/modules/nagios/files/per-host/stabile.debian.org/obsolete-packages-ignore.d-perhost
deleted file mode 100644 (file)
index 4bede3e..0000000
--- a/modules/nagios/files/per-host/stabile.debian.org/obsolete-packages-ignore.d-perhost
+++ /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
new file mode 100644 (file)
index 0000000..0c0ff0d
--- /dev/null
+++ b/modules/nagios/files/per-host/zelenka.debian.org/obsolete-packages-ignore.d-hostspecific
@@ -0,0 +1,11 @@
+##
+## 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
+libgnutls13
+libldap2
+liblzo1
+libopencdk8
+librrd2

diff --git a/modules/nagios/files/per-host/zelenka.debian.org/obsolete-packages-ignore.d-perhost b/modules/nagios/files/per-host/zelenka.debian.org/obsolete-packages-ignore.d-perhost
deleted file mode 100644 (file)
index 0c0ff0d..0000000
--- a/modules/nagios/files/per-host/zelenka.debian.org/obsolete-packages-ignore.d-perhost
+++ /dev/null
@@ -1,11 +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
-libgnutls13
-libldap2
-liblzo1
-libopencdk8
-librrd2

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index 8c6f94c81d8302e60343db547c50d23cfdbb6bee..fca1fb23a4c4378be2bb11ba39efb55f4889d7e5 100644 (file)
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -36,9 +36,9 @@ class nagios::client inherits nagios {
                                     "puppet:///nagios/common/obsolete-packages-ignore" ],
                        require => Package["dsa-nagios-checks"];
 
-               "/etc/nagios/obsolete-packages-ignore.d/perhost":
-                       source  => [ "puppet:///nagios/per-host/$fqdn/obsolete-packages-ignore.d-perhost",
-                                    "puppet:///nagios/common/obsolete-packages-ignore.d-perhost" ],
+               "/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" ],
                        require => Package["dsa-nagios-checks"];
        }