From 397ae9aa892584dc55a4e13c8b401c6951b6ec6d Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Thu, 11 Feb 2010 13:36:50 +0100 Subject: [PATCH] spohr no longer is nagios --- manifests/site.pp | 2 +- modules/samhain/templates/samhainrc.erb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 8b0141c27..60531f940 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -54,7 +54,7 @@ node default { } } case $hostname { - spohr,tchaikovsky: { + tchaikovsky: { include nagios::server } default: { diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb index 85366d827..33b19931e 100644 --- a/modules/samhain/templates/samhainrc.erb +++ b/modules/samhain/templates/samhainrc.erb @@ -135,7 +135,7 @@ file=/etc/nagios/obsolete-packages-ignore.d file=/etc/bind/geodns <%= extradir="" case fqdn -when "spohr.debian.org", "tchaikovsky.debian.org": extradir="file=/etc/nagios3/puppetconf.d +when "tchaikovsky.debian.org": extradir="file=/etc/nagios3/puppetconf.d file=/etc/puppet" else extradir="file=/etc/puppet" end @@ -362,7 +362,7 @@ file=/etc/cron.d/dsa-puppet-stuff file=/etc/cron.d/dsa-buildd <%= extrafiles="" case fqdn -when "spohr.debian.org", "tchaikovsky.debian.org": extrafiles="file=/etc/nagios3/puppetconf.d/auto-hostgroups.cfg +when "tchaikovsky.debian.org": extrafiles="file=/etc/nagios3/puppetconf.d/auto-hostgroups.cfg file=/etc/nagios3/puppetconf.d/auto-hosts.cfg file=/etc/nagios3/puppetconf.d/auto-services.cfg file=/etc/nagios3/puppetconf.d/auto-dependencies.cfg -- 2.20.1