Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios

* 'master' of git+ssh://db.debian.org/git/dsa-nagios:
  rsyncd-hosts updates
  Let's monitor rsync on rsyncd-hosts
  wolkenstein on squeeze
  klecker is down for now
  add jenkins
  local build of samhain is working, I think
  We need to look for two locations, not two directives
  Fix a bashism
  test with == is a bashism
  last 2, and get IPs right
  add armhf hosts
  eder has a /srv
  add eder, eysler
  Get rid of gw-telefonica
  remove locke and lamb, take 2
  remove locke and lamb

Conflicts:
	config/nagios-master.cfg

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index de63de1..e7c85b0 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -59,10 +59,6 @@ servers:
     address: 128.31.0.1
     parents: gw-ubc
     hostgroups: routing-infrastructure
-#  gw-xs4all:
-#    address: 194.109.137.217
-#    parents: gw-ubc
-#    hostgroups: routing-infrastructure
   gw-umn.edu:
     address: 128.101.240.222
     parents: gw-ubc
@@ -388,11 +384,6 @@ servers:
   #  parents: gw-mit-csail
   #  hostgroups: computers, service, dl380, acpid-hosts, hassrvfs
 
-#  klecker:
-#    address: 194.109.137.218
-#    parents: gw-xs4all
-#    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl385, spamd, heavy-exim, xinetd-hosts, lenny
-
   saens:
     address: 128.101.240.212
     parents: gw-umn.edu
@@ -491,6 +482,12 @@ servers:
     address: 130.89.149.227
     parents: kassia
     hostgroups: secondary-IPs
+  
+  klecker:
+    address: 194.109.148.10
+    parents: gw-utwente
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl385, acpid-hosts, xinetd-hosts, squeeze
+
 
   ancina:
     address: 157.193.39.13