From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 22 Sep 2019 09:16:10 +0000 (+0200)
Subject: All (or most) incoming mail is relayed these days, so call the incomingmailrelayed... 
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-nagios.git;a=commitdiff_plain;h=f7c4ccb6a4f7d338819d7b175248a1126d2588de

All (or most) incoming mail is relayed these days, so call the incomingmailrelayed group incomingmailrelayed587 to better match what it really means
---

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 886a19d..72fe605 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -786,7 +786,7 @@ servers:
   zani:
     address: 148.100.88.22
     parents: gw-marist
-    hostgroups: computers, pybuildd, hassrvfs, buster, incomingmailrelayed
+    hostgroups: computers, pybuildd, hassrvfs, buster, incomingmailrelayed587
   # }}}
   # {{{ gw-osuosl
   byrd:
@@ -1344,7 +1344,7 @@ hostgroups:
     alias: hosts with a /var/log filesystem
     private: 1
 
-  incomingmailrelayed:
+  incomingmailrelayed587:
     alias: incoming mail needs to go through a mail relay
     # i.e. no port 25
     private: 1
@@ -2344,7 +2344,7 @@ services:
     name: network service - smtp
     check: dsa_check_smtp
     hostgroups: computers
-    excludehostgroups: postfix-hosts, incomingmailrelayed, incomingmailrelayed2025
+    excludehostgroups: postfix-hosts, incomingmailrelayed587, incomingmailrelayed2025
     depends: process - exim
 
   -
@@ -2355,7 +2355,7 @@ services:
   -
     name: network service - submission
     check: dsa_check_smtp_port!587
-    hostgroups: incomingmailrelayed
+    hostgroups: incomingmailrelayed587
     depends: process - exim
   -
     name: network service - smtp 2025