Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios

* 'master' of git+ssh://db.debian.org/git/dsa-nagios:
  beach and wilder used to need xinetd for rsync, now declared through rsyncd-systemd-hosts
  xinetd used to run on danzi, quantz, nono and wuiet without reason
  lw0X used to need xinetd for rsync, now declared through rsyncd-systemd-hosts
  ... except mirror-accumu which still get it through xinetd
  All now get their rsync via systemd
  mipsel-sil-01 on stretch
  arm-arm-01 on stretch
  We don't use rngd anymore for stretch kvm domains
  mips-sil-01 on stretch
  zani on stretch
  x86-csail-02 on stretch
  arm-conova-01 on stretch
  ppc64el-osuosl-01 on stretch
  x86-ubc-01.d.o on stretch

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index a5ef8bc..d2e2be0 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -130,6 +130,14 @@ servers:
     address: 86.59.118.145
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
+  gw-skroutz1:
+    address: 154.57.0.249
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
+  gw-skroutz2:
+    address: 154.57.0.250
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-ubcece:
     address: 206.12.19.254
     hostgroups: layer3-infrastructure
@@ -920,6 +928,12 @@ servers:
     parents: gw-sil
     hostgroups: computers, buildd, stretch, hassrvfs
   # }}}
+  # {{{ gw-skroutz
+  mirror-skroutz:
+    address: 154.57.0.251
+    parents: gw-skroutz1, gw-skroutz2
+    hostgroups: computers, stretch, service, sw-raid, hassrvfs, apache2-hosts, xinetd-hosts
+  # }}}
   # {{{ gw-ubcece
   sw-ubcece:
     hostgroups: layer2-infrastructure