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

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  monit check for squeeze
  Hostgroup dialup is no longer needed
  Catch empty hostgroups during build
  Move ball and purcell to man-da hosts
  ball moved ip, add purcell

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 9d6491a..6d7cb48 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -548,7 +548,7 @@ servers:
   cimarosa:
     address: 206.12.19.8
     parents: gw-ubc
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, nfs-client, heavy-exim
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, nfs-client, heavy-exim, apache2-hosts
   paganini:
     address: 206.12.19.10
     parents: tchaikovsky
@@ -1719,7 +1719,7 @@ services:
   -
     name: network service - https
     check: check_https
-    hosts: ries, chopin, draghi, liszt, spohr, widor, rietz, tchaikovsky
+    hosts: ries, chopin, draghi, liszt, spohr, widor, rietz, tchaikovsky, cimarosa
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
@@ -1732,7 +1732,8 @@ services:
     # draghi           db.debian.org
     # merkel2          nm.debian.org
     # liszt            lists.debian.org
-    hosts: ries, chopin, spohr, tchaikovsky, draghi, merkel2, liszt, widor, rietz
+    # cimarosa         buildd.debian.org
+    hosts: ries, chopin, spohr, tchaikovsky, draghi, merkel2, liszt, widor, rietz, cimarosa
     depends: network service - https
     normal_check_interval: 60