X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=b32c3ea34d5f87de72854d99b84e311a7679981c;hb=3a1dd55e5e17d117db1e20f67b5659d7e953d33d;hp=d01a087e2aa7e971f1b7fb3591d4483091c6aedb;hpb=70788ce1dc0fc03640fe113ab2a2ee3c47fc57a1;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index d01a087..b32c3ea 100644
--- 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
@@ -432,7 +432,7 @@ servers:
   kassia:
     address: 130.89.149.224
     parents: gw-utwente
-    hostgroups: computers, service, postfix-hosts, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl360, acpid-hosts, ulogd-hosts, lenny, puppet
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl360, acpid-hosts, ulogd-hosts, lenny, puppet, incomingmailrelayed
   kassia-sec:
     address: 130.89.149.225
     parents: kassia
@@ -501,7 +501,7 @@ servers:
   piatti:
     address: 193.167.161.225
     parents: gw-helsinki
-    hostgroups: computers, postfix-hosts, dl385, ulogd-hosts, acpid-hosts, apache2-hosts, postgres83-hosts, lenny, hasbootfs, puppet
+    hostgroups: computers, dl385, ulogd-hosts, acpid-hosts, apache2-hosts, postgres83-hosts, lenny, hasbootfs, puppet, incomingmailrelayed2025
     contacts: holger
 
   rem:
@@ -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
@@ -1327,7 +1327,7 @@ services:
     name: network service - smtp
     check: dsa_check_smtp
     hostgroups: postfix-hosts
-    excludehosts: verdi, kassia, allegri, piatti
+    excludehosts: verdi, allegri
     depends: process - postfix - master
   -
     name: network service - submission
@@ -1342,7 +1342,7 @@ services:
   -
     name: network service - smtp - port 2025
     check: dsa_check_smtp_port!2025
-    hosts: verdi, kassia, murphy, allegri, piatti
+    hosts: verdi, murphy, allegri
     depends: process - postfix - master
   -
     name: network service - smtp - port 8080