From: Martin Zobel-Helas <zobel@debian.org>
Date: Thu, 13 Apr 2017 07:14:01 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios
X-Git-Url: https://wiki.adam-barratt.org.uk/gitweb/?a=commitdiff_plain;h=38d9edf75074d59faee26bac76d582f560d82abc;p=mirror%2Fdsa-nagios.git

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
---

38d9edf75074d59faee26bac76d582f560d82abc
diff --cc config/nagios-master.cfg
index 4a5208d,a5ef8bc..d2e2be0
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@@ -926,14 -918,8 +926,14 @@@ servers
    mipsel-sil-01:
      address: 86.59.118.147
      parents: gw-sil
-     hostgroups: computers, buildd, jessie, hassrvfs
+     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