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

* 'master' of git+ssh://db.debian.org/git/dsa-nagios:
  gombert is now doing mail

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index aac9011..068943c 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -625,7 +625,7 @@ servers:
   rossini:
     address: 206.12.19.19
     parents: tchaikovsky
-    hostgroups: computers, dl585, acpid-hosts, service, squeeze, apache2-hosts
+    hostgroups: computers, dl585, acpid-hosts, service, squeeze, apache2-hosts, apache-https
   salieri:
     address: 206.12.19.20
     parents: tchaikovsky
@@ -701,7 +701,7 @@ servers:
   diabelli:
     address: 206.12.19.136
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, apache-https
   bizet:
     address: 206.12.19.137
     parents: traetta