remove zappa

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 53c4ecf..84165bf 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -84,10 +84,6 @@ servers:
     address: 82.195.75.126
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-marist0:
-    address: 148.100.96.1
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
   gw-marist:
     address: 148.100.88.1
     parents: gw-ubcece
@@ -566,10 +562,6 @@ servers:
     hostgroups: computers, service, kvmdomains, wheezy, bind9-hosts
   # }}}
   # {{{ gw-marist
-  zappa:
-    address: 148.100.96.103
-    parents: gw-marist0
-    hostgroups: computers, buildd, hassrvfs, squeeze, incomingmailrelayed
   zani:
     address: 148.100.88.22
     parents: gw-marist