Move obsolete-packages-ignore.d/hostspecific to a template

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/manifests/client.pp b/modules/nagios/manifests/client.pp
index 5a799446a1b398c35fa7e149a7a8c768e5f8bf6f..285fdfc0c788b5079ae0cc8472da6b6136ca6df5 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..196f183
--- /dev/null
+++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
@@ -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