ancina is in incomingmailrelayed, and so is lafayette

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 05c021d..1728252 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -454,7 +454,7 @@ servers:
   ancina:
     address: 157.193.39.13
     parents: gw-ghent
-    hostgroups: computers, buildd, single-cpu, lenny, puppet, hassrvfs, hasbootfs
+    hostgroups: computers, buildd, single-cpu, lenny, puppet, hassrvfs, hasbootfs, incomingmailrelayed
     contacts: luk
 
   agnesi:
@@ -541,7 +541,7 @@ servers:
   lafayette:
     address: 147.215.7.160
     parents: gw-esiee
-    hostgroups: computers, buildd, lenny, puppet, sw-raid, hassrvfs, hasbootfs
+    hostgroups: computers, buildd, lenny, puppet, sw-raid, hassrvfs, hasbootfs, incomingmailrelayed
 
 #############################
 # host groups
@@ -698,6 +698,10 @@ hostgroups:
     alias: hosts with a /srv
     private: 1
 
+  incomingmailrelayed:
+    alias: incoming mail needs to go through a mail relay
+    # i.e. no port 25
+    private: 1
 
 #############################
 # servicegroups
@@ -1301,8 +1305,7 @@ services:
     name: network service - smtp
     check: dsa_check_smtp
     hostgroups: computers
-    excludehostgroups: postfix-hosts
-    excludehosts: lafayette
+    excludehostgroups: postfix-hosts, incomingmailrelayed
     depends: process - exim
 
   -
@@ -1314,7 +1317,7 @@ services:
   -
     name: network service - submission
     check: dsa_check_smtp_port!587
-    hosts: lafayette
+    hostgroups: incomingmailrelayed
     depends: process - exim
   -
     name: network service - smtp - port 2025