From: Stephen Gran Date: Sat, 26 Sep 2009 09:25:31 +0000 (+0100) Subject: inc-debian.org now a template X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=ad3f2c0f8d506aa80836ea34593019ffa79d16cb;p=mirror%2Fdsa-puppet.git inc-debian.org now a template Signed-off-by: Stephen Gran --- diff --git a/modules/nagios/files/common/inc-debian.org b/modules/nagios/files/common/inc-debian.org deleted file mode 100644 index 70070fba2..000000000 --- a/modules/nagios/files/common/inc-debian.org +++ /dev/null @@ -1,5 +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 -## -allowed_hosts=192.25.206.33,82.195.75.106 diff --git a/modules/nagios/files/per-host/caballero.debian.org/inc-debian.org b/modules/nagios/files/per-host/caballero.debian.org/inc-debian.org deleted file mode 100644 index 2d39c0cf6..000000000 --- a/modules/nagios/files/per-host/caballero.debian.org/inc-debian.org +++ /dev/null @@ -1,5 +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 -## -allowed_hosts=192.25.206.33,192.34.35.49,82.195.75.106 diff --git a/modules/nagios/files/per-host/mundy.debian.org/inc-debian.org b/modules/nagios/files/per-host/mundy.debian.org/inc-debian.org deleted file mode 100644 index 2d39c0cf6..000000000 --- a/modules/nagios/files/per-host/mundy.debian.org/inc-debian.org +++ /dev/null @@ -1,5 +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 -## -allowed_hosts=192.25.206.33,192.34.35.49,82.195.75.106 diff --git a/modules/nagios/files/per-host/penalosa.debian.org/inc-debian.org b/modules/nagios/files/per-host/penalosa.debian.org/inc-debian.org deleted file mode 100644 index 2d39c0cf6..000000000 --- a/modules/nagios/files/per-host/penalosa.debian.org/inc-debian.org +++ /dev/null @@ -1,5 +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 -## -allowed_hosts=192.25.206.33,192.34.35.49,82.195.75.106 diff --git a/modules/nagios/files/per-host/peri.debian.org/inc-debian.org b/modules/nagios/files/per-host/peri.debian.org/inc-debian.org deleted file mode 100644 index 2d39c0cf6..000000000 --- a/modules/nagios/files/per-host/peri.debian.org/inc-debian.org +++ /dev/null @@ -1,5 +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 -## -allowed_hosts=192.25.206.33,192.34.35.49,82.195.75.106 diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp index a49aec527..d06daa5b6 100644 --- a/modules/nagios/manifests/client.pp +++ b/modules/nagios/manifests/client.pp @@ -23,8 +23,7 @@ class nagios::client inherits nagios { require => Package["nagios-nrpe-server"], ensure => directory; "/etc/nagios/nrpe.d/debianorg.cfg": - source => [ "puppet:///nagios/per-host/$fqdn/inc-debian.org", - "puppet:///nagios/common/inc-debian.org" ], + content => template("nagios/inc-debian.org.erb"); require => Package["nagios-nrpe-server"], notify => Exec["nagios-nrpe-server restart"]; "/etc/nagios/nrpe.d/nrpe_dsa.cfg": diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb new file mode 100644 index 000000000..817026e48 --- /dev/null +++ b/modules/nagios/templates/inc-debian.org.erb @@ -0,0 +1,15 @@ +## +## 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 +## + +<%- +nagii = [ '192.25.206.33', '82.195.75.106' ] + +case fqdn when + 'mundy.debian.org', 'penalosa.debian.org', 'caballero.debian.org', 'peri.debian.org' then + nagii << '192.34.35.49' +end + +print "allowed_hosts=" + nagii.join(',') +%>