X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=dbe71ebd254252ad4ac7fecff18ac19f6feaa0b7;hb=f262b2a3c31c6a8d2d9f917f3e08c35a7966bd00;hp=68baf5b63683dfeda53a1af2066fa49cc53257b1;hpb=a8f77dad537fb81dd716280aef0603dfd888e540;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 68baf5b..dbe71eb 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -189,7 +189,7 @@ servers:
   mirror-accumu:
     address: 130.242.6.199
     parents: gw-accumu2
-    hostgroups: computers, service, stretch, apache2-hosts, hassrvfs, rsyncd-hosts, xinetd-hosts
+    hostgroups: computers, service, stretch, apache2-hosts, hassrvfs, rsyncd-systemd-hosts
   # }}}
   # {{{ gw-aql
   eller:
@@ -486,7 +486,7 @@ servers:
   mekeel:
     address: 5.153.231.40
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, autofs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, nfs-client, autofs, systemd-timesyncd
   pinel:
     address: 5.153.231.42
     parents: ganeti-bytemark
@@ -498,7 +498,7 @@ servers:
   manziarly:
     address: 5.153.231.44
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, apache2-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, autofs, nfs-client, apache2-hosts, apache-https, systemd-timesyncd
 
   casulana:
     address: 5.153.231.41
@@ -1314,9 +1314,6 @@ hostgroups:
   amavis-hosts:
     alias: hosts running amavis
     private: 1
-  rsyncd-hosts:
-    alias: hosts providing rsync services via xinetd
-    private: 1
   rsyncd-systemd-hosts:
     alias: hosts providing rsync services via systemd
     private: 1
@@ -3059,11 +3056,6 @@ services:
     name: network service - rsync
     check: check_tcp!873
     hostgroups: rsyncd-systemd-hosts
-  -
-    name: network service - rsync
-    check: check_tcp!873
-    hostgroups: rsyncd-hosts
-    depends: process - xinetd
   -
     name: network service - rsync
     check: check_tcp!873