From e1d5c69770ca56c9585455473b9a445220b99c2c Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 14 Jun 2009 12:18:31 +0200 Subject: [PATCH] Move per host obsolete/local packages ignore into their own files --- .../nagios/files/common/obsolete-packages-ignore.d-perhost | 6 ++++++ ...e-packages-ignore => obsolete-packages-ignore.d-perhost} | 5 ----- ...e-packages-ignore => obsolete-packages-ignore.d-perhost} | 5 ----- ...e-packages-ignore => obsolete-packages-ignore.d-perhost} | 5 ----- ...e-packages-ignore => obsolete-packages-ignore.d-perhost} | 5 ----- modules/nagios/manifests/client.pp | 5 +++++ 6 files changed, 11 insertions(+), 20 deletions(-) create mode 100644 modules/nagios/files/common/obsolete-packages-ignore.d-perhost rename modules/nagios/files/per-host/liszt.debian.org/{obsolete-packages-ignore => obsolete-packages-ignore.d-perhost} (77%) rename modules/nagios/files/per-host/samosa.debian.org/{obsolete-packages-ignore => obsolete-packages-ignore.d-perhost} (85%) rename modules/nagios/files/per-host/stabile.debian.org/{obsolete-packages-ignore => obsolete-packages-ignore.d-perhost} (76%) rename modules/nagios/files/per-host/zelenka.debian.org/{obsolete-packages-ignore => obsolete-packages-ignore.d-perhost} (81%) diff --git a/modules/nagios/files/common/obsolete-packages-ignore.d-perhost b/modules/nagios/files/common/obsolete-packages-ignore.d-perhost new file mode 100644 index 000000000..196f1833d --- /dev/null +++ b/modules/nagios/files/common/obsolete-packages-ignore.d-perhost @@ -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/per-host/liszt.debian.org/obsolete-packages-ignore b/modules/nagios/files/per-host/liszt.debian.org/obsolete-packages-ignore.d-perhost similarity index 77% rename from modules/nagios/files/per-host/liszt.debian.org/obsolete-packages-ignore rename to modules/nagios/files/per-host/liszt.debian.org/obsolete-packages-ignore.d-perhost index fdf0389f2..bfc2f3b10 100644 --- a/modules/nagios/files/per-host/liszt.debian.org/obsolete-packages-ignore +++ b/modules/nagios/files/per-host/liszt.debian.org/obsolete-packages-ignore.d-perhost @@ -3,9 +3,4 @@ ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git ## -/linux-image-.*/ -/kernel-image-.*/ -buildd -sbuild - amavisd-new diff --git a/modules/nagios/files/per-host/samosa.debian.org/obsolete-packages-ignore b/modules/nagios/files/per-host/samosa.debian.org/obsolete-packages-ignore.d-perhost similarity index 85% rename from modules/nagios/files/per-host/samosa.debian.org/obsolete-packages-ignore rename to modules/nagios/files/per-host/samosa.debian.org/obsolete-packages-ignore.d-perhost index 2ef9ca8c0..13d91f667 100644 --- a/modules/nagios/files/per-host/samosa.debian.org/obsolete-packages-ignore +++ b/modules/nagios/files/per-host/samosa.debian.org/obsolete-packages-ignore.d-perhost @@ -3,11 +3,6 @@ ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git ## -/linux-image-.*/ -/kernel-image-.*/ -buildd -sbuild - postgresql-client-common postgresql-client-8.4 postgresql-server-dev-8.4 diff --git a/modules/nagios/files/per-host/stabile.debian.org/obsolete-packages-ignore b/modules/nagios/files/per-host/stabile.debian.org/obsolete-packages-ignore.d-perhost similarity index 76% rename from modules/nagios/files/per-host/stabile.debian.org/obsolete-packages-ignore rename to modules/nagios/files/per-host/stabile.debian.org/obsolete-packages-ignore.d-perhost index 3fa180f4c..4bede3e0c 100644 --- a/modules/nagios/files/per-host/stabile.debian.org/obsolete-packages-ignore +++ b/modules/nagios/files/per-host/stabile.debian.org/obsolete-packages-ignore.d-perhost @@ -3,9 +3,4 @@ ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git ## -/linux-image-.*/ -/kernel-image-.*/ -buildd -sbuild - xfsprogs diff --git a/modules/nagios/files/per-host/zelenka.debian.org/obsolete-packages-ignore b/modules/nagios/files/per-host/zelenka.debian.org/obsolete-packages-ignore.d-perhost similarity index 81% rename from modules/nagios/files/per-host/zelenka.debian.org/obsolete-packages-ignore rename to modules/nagios/files/per-host/zelenka.debian.org/obsolete-packages-ignore.d-perhost index 1cc6322ab..0c0ff0d17 100644 --- a/modules/nagios/files/per-host/zelenka.debian.org/obsolete-packages-ignore +++ b/modules/nagios/files/per-host/zelenka.debian.org/obsolete-packages-ignore.d-perhost @@ -3,11 +3,6 @@ ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git ## -/linux-image-.*/ -/kernel-image-.*/ -buildd -sbuild - zabbix-agent libgnutls13 libldap2 diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp index d32345132..8c6f94c81 100644 --- a/modules/nagios/manifests/client.pp +++ b/modules/nagios/manifests/client.pp @@ -35,6 +35,11 @@ class nagios::client inherits nagios { source => [ "puppet:///nagios/per-host/$fqdn/obsolete-packages-ignore", "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" ], + require => Package["dsa-nagios-checks"]; } exec { "nagios-nrpe-server restart": -- 2.20.1