From: Martin Zobel-Helas Date: Sat, 28 Oct 2017 18:32:10 +0000 (+0200) Subject: Merge branch 'master' of git+ssh://db.debian.org/srv/db.debian.org/git/dsa-nagios X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=16bd27cff58b3f6373c9e655fc272e85302742f2;p=mirror%2Fdsa-nagios.git Merge branch 'master' of git+ssh://db.debian.org/srv/db.debian.org/git/dsa-nagios Signed-off-by: Martin Zobel-Helas --- 16bd27cff58b3f6373c9e655fc272e85302742f2 diff --cc config/nagios-master.cfg index 27a3268,e898713..a1eb447 --- a/config/nagios-master.cfg +++ b/config/nagios-master.cfg @@@ -809,7 -809,7 +809,7 @@@ servers wilder: address: 82.195.75.112 parents: ganeti3 - hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, stretch, apache-https, rsyncd-systemd-hosts - hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, jessie, apache-https, rsyncd-hosts ++ hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, stretch, apache-https, rsyncd-hosts mailly: address: 82.195.75.114 parents: ganeti3