[project @ peter@palfrader.org-20090110152430-85h5u3g54ric8r4q]

merkel also has an apache2; raff moved from apache1 to apache2

diff --git a/nagios-master.cfg b/nagios-master.cfg
index de85d20..33af665 100644 (file)
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -163,7 +163,7 @@ servers:
   raff:
     address: 192.25.206.59
     parents: samosa
-    hostgroups: computers, no-udev, service, dl380, apache1-hosts, bind9-hosts, rsyncd-hosts, heavy-exim, ulogd-hosts, nfs-client
+    hostgroups: computers, no-udev, service, dl380, apache2-hosts, bind9-hosts, rsyncd-hosts, heavy-exim, ulogd-hosts, nfs-client
   gluck:
     address: 192.25.206.10
     parents: samosa
@@ -171,7 +171,7 @@ servers:
   merkel:
     address: 192.25.206.16
     parents: samosa
-    hostgroups: computers, general, apache1-hosts, bind9-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim, nfs-client, ulogd-hosts
+    hostgroups: computers, general, apache1-hosts, apache2-hosts, bind9-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim, nfs-client, ulogd-hosts
   spohr:
     address: 192.25.206.33
     parents: samosa
@@ -1490,7 +1490,7 @@ services:
     name: network service - http keyserver
     check: dsa_check_http_port!11371
     hosts: raff
-    depends: process - apache - master
+    depends: process - apache2 - master
 
   -
     name: network service - https