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 --combined config/nagios-master.cfg
index 4a5208d,a5ef8bc..d2e2be0
--- 1/config/nagios-master.cfg
--- 2/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@@ -130,14 -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
@@@ -178,7 -170,7 +178,7 @@@
    wieck:
      address: 195.20.242.89
      parents: gw-1und1-sec
-     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, xinetd-hosts, jessie, security_mirror, hasvarlogfs, no-bacula
+     hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, xinetd-hosts, jessie, security_mirror, hasvarlogfs, no-bacula
    # }}}
    # {{{ gw-accumu
    pettersson:
@@@ -192,7 -184,7 +192,7 @@@
    mirror-accumu:
      address: 130.242.6.199
      parents: gw-accumu2
-     hostgroups: computers, service, jessie, apache2-hosts, hassrvfs, xinetd-hosts
+     hostgroups: computers, service, jessie, apache2-hosts, hassrvfs, rsyncd-hosts, xinetd-hosts
    # }}}
    # {{{ gw-aql
    eller:
@@@ -248,7 -240,7 +248,7 @@@
    arm-arm-01:
      address: 217.140.96.58
      parents: gw-arm
-     hostgroups: computers, hassrvfs, buildd, jessie, broken_mq
+     hostgroups: computers, hassrvfs, buildd, stretch, broken_mq
    arm-arm-03:
      address: 217.140.96.60
      parents: gw-arm
@@@ -274,7 -266,7 +274,7 @@@
    franck:
      address: 138.16.160.12
      parents: gw-brown
-     hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, xinetd-hosts, apache-https, hassrvfs, jessie
+     hostgroups: computers, service, apache2-hosts, dl380, rsyncd-systemd-hosts, xinetd-hosts, apache-https, hassrvfs, jessie
    fasolo:
      address: 138.16.160.17
      parents: gw-brown
@@@ -407,7 -399,7 +407,7 @@@
    wuiet:
      address: 5.153.231.18
      parents: ganeti-bytemark
-     hostgroups: computers, general, kvmdomains, jessie, service, apache-https, apache2-hosts, heavy-exim, xinetd-hosts, systemd-timesyncd
+     hostgroups: computers, general, kvmdomains, jessie, service, apache-https, apache2-hosts, heavy-exim, systemd-timesyncd
    dinis:
      address: 5.153.231.19
      parents: ganeti-bytemark
@@@ -445,7 -437,7 +445,7 @@@
    quantz:
      address: 5.153.231.28
      parents: ganeti-bytemark
-     hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, apache2-hosts, autofs, apache-https, systemd-timesyncd
+     hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, heavy-exim, apache2-hosts, autofs, apache-https, systemd-timesyncd
    respighi:
      address: 5.153.231.29
      parents: ganeti-bytemark
@@@ -520,7 -512,7 +520,7 @@@
    santoro:
      address: 200.17.202.197
      parents: gw-c3sl
-     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, jessie, high-RTT, security_mirror, no-bacula, apache-https
+     hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, xinetd-hosts, hassrvfs, jessie, high-RTT, security_mirror, no-bacula, apache-https
      contacts: faw
    # }}}
    # {{{ gw-cecsit
@@@ -566,7 -558,7 +566,7 @@@
    arm-conova-01:
      address: 217.196.149.230
      parents: aagaard
-     hostgroups: computers, hassrvfs, buildd, jessie
+     hostgroups: computers, hassrvfs, buildd, stretch
    # }}}
    # {{{ gw-csail
    csail-node01:
@@@ -593,7 -585,7 +593,7 @@@
    mirror-csail:
      address: 128.31.0.62
      parents: ganeti-csail
-     hostgroups: computers, service, hassrvfs, kvmdomains, jessie, apache2-hosts, rsyncd-hosts, xinetd-hosts, apache-https, systemd-timesyncd
+     hostgroups: computers, service, hassrvfs, kvmdomains, jessie, apache2-hosts, rsyncd-systemd-hosts, xinetd-hosts, apache-https, systemd-timesyncd
    x86-csail-01:
      address: 128.31.0.50
      parents: ganeti-csail
@@@ -601,7 -593,7 +601,7 @@@
    x86-csail-02:
      address: 128.31.0.68
      parents: ganeti-csail
-     hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie, systemd-timesyncd
+     hostgroups: computers, buildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
    httpredir-csail-01:
      address: 128.31.0.66
      parents: ganeti-csail
@@@ -629,7 -621,7 +629,7 @@@
    sechter:
      address: 128.61.240.73
      parents: gw-gatech
-     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, hasbootfs, hassrvfs, xinetd-hosts, jessie, security_mirror
+     hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, sw-raid, hasbootfs, hassrvfs, xinetd-hosts, jessie, security_mirror
    # }}}
    # {{{ gw-grnet
    ganeti-grnet:
@@@ -703,19 -695,19 +703,19 @@@
    lw01:
      address: 185.17.185.177
      parents: gw-leaseweb
-     hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts, xinetd-hosts
+     hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-systemd-hosts
    lw02:
      address: 185.17.185.178
      parents: gw-leaseweb
-     hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts, xinetd-hosts
+     hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-systemd-hosts
    lw03:
      address: 185.17.185.179
      parents: gw-leaseweb
-     hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts, xinetd-hosts
+     hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-systemd-hosts
    lw04:
      address: 185.17.185.180
      parents: gw-leaseweb
-     hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts, xinetd-hosts
+     hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-systemd-hosts
    lw07:
      address: 185.17.185.187
      parents: gw-leaseweb
@@@ -808,7 -800,7 +808,7 @@@
    wilder:
      address: 82.195.75.112
      parents: ganeti3
-     hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, jessie, apache-https, rsyncd-hosts, xinetd-hosts
+     hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, jessie, apache-https, rsyncd-systemd-hosts
    mailly:
      address: 82.195.75.114
      parents: ganeti3
@@@ -850,7 -842,7 +850,7 @@@
    zani:
      address: 148.100.88.22
      parents: gw-marist
-     hostgroups: computers, buildd, hassrvfs, jessie, incomingmailrelayed
+     hostgroups: computers, buildd, hassrvfs, stretch, incomingmailrelayed
    # }}}
    # {{{ gw-osuosl
    busoni:
@@@ -865,7 -857,7 +865,7 @@@
    beach:
      address: 140.211.166.201
      parents: byrd
-     hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, xinetd-hosts, hassrvfs, rsyncd-hosts, apache-https
+     hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, hassrvfs, rsyncd-systemd-hosts, apache-https
  
    pieta:
      address: 140.211.166.195
@@@ -874,7 -866,7 +874,7 @@@
    ppc64el-osuosl-01:
      address: 140.211.166.196
      parents: pieta
-     hostgroups: computers, hassrvfs, buildd, jessie
+     hostgroups: computers, hassrvfs, buildd, stretch
    powerpc-osuosl-01:
      address: 140.211.166.197
      parents: pieta
@@@ -908,11 -900,11 +908,11 @@@
    lobos:
      address: 212.211.132.250
      parents: gw-scanplus-lobos
-     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, xinetd-hosts, jessie, security_mirror
+     hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, dl380, hassrvfs, xinetd-hosts, jessie, security_mirror
    villa:
      address: 212.211.132.32
      parents: gw-scanplus-villa
-     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl360, hassrvfs, xinetd-hosts, jessie, security_mirror
+     hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, dl360, hassrvfs, xinetd-hosts, jessie, security_mirror
    # }}}
    # {{{ gw-sil
    eberlin:
@@@ -922,18 -914,12 +922,18 @@@
    mips-sil-01:
      address: 86.59.118.146
      parents: gw-sil
-     hostgroups: computers, buildd, jessie, hassrvfs
+     hostgroups: computers, buildd, stretch, hassrvfs
    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
@@@ -1019,7 -1005,7 +1019,7 @@@
    x86-ubc-01:
      address: 209.87.16.21
      parents: ubc-gateway
-     hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie, systemd-timesyncd
+     hostgroups: computers, buildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
    finzi:
      address: 209.87.16.22
      parents: ubc-gateway
@@@ -1041,7 -1027,7 +1041,7 @@@
    nono:
      address: 209.87.16.26
      parents: ubc-gateway
-     hostgroups: computers, service, kvmdomains, jessie, heavy-exim, xinetd-hosts, apache2-hosts, apache-https, broken_https_default_vhost, hassrvfs, systemd-timesyncd
+     hostgroups: computers, service, kvmdomains, jessie, heavy-exim, apache2-hosts, apache-https, broken_https_default_vhost, hassrvfs, systemd-timesyncd
    reger:
      address: 209.87.16.27
      parents: ubc-gateway
@@@ -1057,7 -1043,7 +1057,7 @@@
    danzi:
      address: 209.87.16.30
      parents: ubc-gateway
-     hostgroups: computers, service, kvmdomains, jessie, postgres94-hosts, xinetd-hosts, systemd-timesyncd
+     hostgroups: computers, service, kvmdomains, jessie, postgres94-hosts, systemd-timesyncd
    geo2:
      address: 209.87.16.31
      parents: ubc-gateway
@@@ -1104,7 -1090,7 +1104,7 @@@
    #saens:
    #  address: 128.101.240.212
    #  parents: gw-umn
-   #  hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
+   #  hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
    mirror-umn:
      address: 128.101.240.212
      parents: gw-umn
@@@ -1144,7 -1130,7 +1144,7 @@@
    klecker:
      address: 130.89.148.10
      parents: gw-utwente
-     hostgroups: computers, service, apache2-hosts, apache-https, rsyncd-hosts, dl380, xinetd-hosts, jessie, incomingmailrelayed2025, hassrvfs
+     hostgroups: computers, service, apache2-hosts, apache-https, rsyncd-systemd-hosts, dl380, xinetd-hosts, jessie, incomingmailrelayed2025, hassrvfs
    klecker-ftp:
      address: 130.89.148.12
      parents: klecker
@@@ -1202,7 -1188,7 +1202,7 @@@
    setoguchi:
      address: 133.242.99.74
      parents: gw-sakura
-     hostgroups: computers, service, jessie, no-bacula, hassrvfs, apache2-hosts, rsyncd-hosts, xinetd-hosts, security_mirror
+     hostgroups: computers, service, jessie, no-bacula, hassrvfs, apache2-hosts, rsyncd-systemd-hosts, xinetd-hosts, security_mirror
    # }}}
  
  # {{{ ############################# host groups #############################
@@@ -2056,6 -2042,7 +2056,7 @@@ services
      name: process - rngd
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C rngd -a '/usr/sbin/rngd -r /dev/hwrng'"
      hostgroups: kvmdomains
+     excludehostgroups: stretch
    # }}}
    # {{{ anti-services
    -