spohr no longer is nagios

diff --git a/manifests/site.pp b/manifests/site.pp
index 8b0141c276656657a4d322bc8c54bdaf17c2fc19..60531f940e0c2c98cf1069dac4912877bb3f85ac 100644 (file)
--- 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 85366d827fa5ea61299e4838bae62daf773535ab..33b19931e6a00849973f2465ce120c64ef0966f0 100644 (file)
--- 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