From: Peter Palfrader Date: Sat, 9 Jan 2010 12:02:39 +0000 (+0100) Subject: Move obsolete-packages-ignore.d/hostspecific to a template X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=2ba026766b02ceea98285b507b303ba3cd0f080f;hp=09f53cc3299c6699be7959e6aff131d0034d97f8;p=mirror%2Fdsa-puppet.git 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 index 196f1833d..000000000 --- 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 5a799446a..285fdfc0c 100644 --- 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 index 000000000..196f1833d --- /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