From: Peter Palfrader Date: Sun, 14 Jun 2009 10:18:31 +0000 (+0200) Subject: Move per host obsolete/local packages ignore into their own files X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=e1d5c69770ca56c9585455473b9a445220b99c2c;hp=37822cb6b7be585e3eb181b916161b736d2e2358;p=mirror%2Fdsa-puppet.git Move per host obsolete/local packages ignore into their own files --- 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 deleted file mode 100644 index fdf0389f2..000000000 --- a/modules/nagios/files/per-host/liszt.debian.org/obsolete-packages-ignore +++ /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 -## - -/linux-image-.*/ -/kernel-image-.*/ -buildd -sbuild - -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 new file mode 100644 index 000000000..bfc2f3b10 --- /dev/null +++ b/modules/nagios/files/per-host/liszt.debian.org/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 +## + +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 deleted file mode 100644 index 2ef9ca8c0..000000000 --- a/modules/nagios/files/per-host/samosa.debian.org/obsolete-packages-ignore +++ /dev/null @@ -1,18 +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 -## - -/linux-image-.*/ -/kernel-image-.*/ -buildd -sbuild - -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 new file mode 100644 index 000000000..13d91f667 --- /dev/null +++ b/modules/nagios/files/per-host/samosa.debian.org/obsolete-packages-ignore.d-perhost @@ -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/stabile.debian.org/obsolete-packages-ignore b/modules/nagios/files/per-host/stabile.debian.org/obsolete-packages-ignore deleted file mode 100644 index 3fa180f4c..000000000 --- a/modules/nagios/files/per-host/stabile.debian.org/obsolete-packages-ignore +++ /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 -## - -/linux-image-.*/ -/kernel-image-.*/ -buildd -sbuild - -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 new file mode 100644 index 000000000..4bede3e0c --- /dev/null +++ b/modules/nagios/files/per-host/stabile.debian.org/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 +## + +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 deleted file mode 100644 index 1cc6322ab..000000000 --- a/modules/nagios/files/per-host/zelenka.debian.org/obsolete-packages-ignore +++ /dev/null @@ -1,16 +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 -## - -/linux-image-.*/ -/kernel-image-.*/ -buildd -sbuild - -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 new file mode 100644 index 000000000..0c0ff0d17 --- /dev/null +++ b/modules/nagios/files/per-host/zelenka.debian.org/obsolete-packages-ignore.d-perhost @@ -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/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":