X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=930028b137851d95294c6ec0b471eb8e83dcfd8e;hb=10008cb7d1fe87acdad30a99eee6893d93d2e995;hp=03a97691f9416a4f3bff0a1b3a39929bc8512790;hpb=79a989c41e841b2c83456ab158028c0173ddbbc3;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 03a9769..930028b 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -188,7 +188,7 @@ servers:
     hostgroups: computers, general, apache1-hosts, apache2-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim, nfs-client, ulogd-hosts, lenny, puppet
   spohr:
     address: 192.25.206.33
-    hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, ulogd-hosts, nfs-server, lenny, puppet
+    hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, ulogd-hosts, nfs-server, lenny, puppet, heavy-exim
   spohr2:
     address: 192.25.206.38
     parents: rietz
@@ -272,7 +272,7 @@ servers:
   murphy:
     address: 70.103.162.31
     parents: gw-brainfood
-    hostgroups: computers, general, postfix-hosts, dl380, acpid-hosts, lenny, puppet
+    hostgroups: computers, general, dl380, acpid-hosts, lenny, puppet
 
   ries:
     address: 128.148.34.103
@@ -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
@@ -449,7 +449,7 @@ servers:
   allegri:
     address: 157.193.39.233
     parents: gw-ghent
-    hostgroups: computers, buildd, postfix-hosts, sw-raid, single-cpu, lenny, puppet, hassrvfs
+    hostgroups: computers, buildd, sw-raid, single-cpu, lenny, puppet, hassrvfs, incomingmailrelayed2025
     contacts: luk
   ancina:
     address: 157.193.39.13
@@ -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
@@ -541,7 +541,7 @@ servers:
   lafayette:
     address: 147.215.7.160
     parents: gw-esiee
-    hostgroups: computers, buildd, lenny, puppet, sw-raid, hassrvfs, hasbootfs, incomingmailrelayed
+    hostgroups: computers, buildd, lenny, puppet, sw-raid, hassrvfs, hasbootfs
 
 #############################
 # host groups
@@ -1327,7 +1327,7 @@ services:
     name: network service - smtp
     check: dsa_check_smtp
     hostgroups: postfix-hosts
-    excludehosts: verdi, kassia, allegri, piatti
+    excludehosts: verdi
     depends: process - postfix - master
   -
     name: network service - submission
@@ -1342,12 +1342,7 @@ services:
   -
     name: network service - smtp - port 2025
     check: dsa_check_smtp_port!2025
-    hosts: verdi, kassia, murphy, allegri, piatti
-    depends: process - postfix - master
-  -
-    name: network service - smtp - port 8080
-    check: dsa_check_smtp_port!8080
-    hosts: murphy
+    hosts: verdi
     depends: process - postfix - master
   -
     name: network service local - smtps cert