Resolve conflict

[mirror/dsa-nagios.git] / config / nagios-master.cfg

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index d01a087..4fcb4e9 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -221,11 +221,11 @@ servers:
     parents: gw-man-da
     hostgroups: computers, service, dl385, bind9-hosts, lenny, puppet, hasvarfs
     contacts: joerg, bzed
-  morales:
-    address: 82.195.75.97
-    parents: gw-man-da
-    hostgroups: computers, porterbox, single-cpu, no-samhain, hasbootfs, hassrvfs, lenny, puppet, hasvarfs, hasusrfs
-    contacts: bzed
+  #morales:
+  #  address: 82.195.75.97
+  #  parents: gw-man-da
+  #  hostgroups: computers, porterbox, single-cpu, no-samhain, hasbootfs, hassrvfs, lenny, puppet, hasvarfs, hasusrfs
+  #  contacts: bzed
   sperger:
     address: 82.195.75.98
     parents: gw-man-da
@@ -522,7 +522,7 @@ servers:
   escher:
     address: 213.188.99.215
     parents: gw-cst
-    hostgroups: computers, single-cpu, hasbootfs, hasvarfs
+    hostgroups: computers, single-cpu, hasbootfs, lenny, puppet, hasvarfs
   goedel:
     address: 213.188.99.214
     parents: gw-cst