X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=nagios-master.cfg;h=9ffaf966e30455a8895a3a1254c57441882d680a;hb=6276595ff8a1510e4b86be8ad00d0d5346ecd81c;hp=52ab1db699f5810d2bad1d8b281d26d8299218be;hpb=a3845453c3ecc149da6c10bd57b7c95cace29fe1;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 52ab1db..9ffaf96 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -646,12 +646,12 @@ services:
     check: check_ntp
     hostgroups: computers
     depends: process - ntpd
-    excludehosts: raptor
+    excludehosts: raptor, allegri
   #
   -
     name: network service - time
-    check: check_time
-    hosts: raptor
+    check: dsa_check_time
+    hosts: raptor, allegri
     depends: process - xinetd
 
  ###
@@ -914,12 +914,7 @@ services:
   -
     name: network service - smtp - port 2025
     check: dsa_check_smtp_port!2025
-    hosts: verdi, kassia, murphy
-    depends: process - postfix - master
-  -
-    name: network service - smtp - port 8080
-    check: dsa_check_smtp_port!8080
-    hosts: allegri
+    hosts: verdi, kassia, murphy, allegri
     depends: process - postfix - master
 
   -
@@ -1037,13 +1032,13 @@ services:
   -
     name: process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xinetd -a '/usr/sbin/xinetd -pidfile /var/run/xinetd.pid -stayalive'"
-    hosts: samosa, raptor
+    hosts: samosa, raptor, allegri
     hostgroups: rsyncd-hosts
   -
     name: unwanted process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C xinetd"
     hostgroups: computers
-    excludehosts: samosa, raptor
+    excludehosts: samosa, raptor, allegri
     excludehostgroups: rsyncd-hosts
  ###
   -