From: Peter Palfrader Date: Sun, 14 Jun 2009 10:20:10 +0000 (+0200) Subject: s/perhost/hostspecific/ X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5e7c21b2071856d90305439ca7377c50a2017049;p=dsa-puppet.git 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 index 00000000..196f1833 --- /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 index 196f1833..00000000 --- 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 index 00000000..bfc2f3b1 --- /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 index bfc2f3b1..00000000 --- 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 index 00000000..13d91f66 --- /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 index 13d91f66..00000000 --- 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 index 00000000..4bede3e0 --- /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 index 4bede3e0..00000000 --- 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 index 00000000..0c0ff0d1 --- /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 index 0c0ff0d1..00000000 --- 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 8c6f94c8..fca1fb23 100644 --- 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"]; }