From: Aurelien Jarno <aurelien@aurel32.net>
Date: Tue, 20 Sep 2016 09:40:03 +0000 (+0200)
Subject: Move diabelli.d.o and menotti.d.o from ganeti2.d.o to ganeti2.ubc.d.o
X-Git-Url: https://wiki.adam-barratt.org.uk/gitweb/?a=commitdiff_plain;h=45e68b452e8a36ea46ed7d85ba72302143ef538b;p=mirror%2Fdsa-nagios.git

Move diabelli.d.o and menotti.d.o from ganeti2.d.o to ganeti2.ubc.d.o

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index faa3fd5..6c4f7cc 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -983,10 +983,6 @@ servers:
     address: 206.12.19.133
     parents: ganeti2
     hostgroups: computers, service, kvmdomains, jessie
-  diabelli:
-    address: 206.12.19.136
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, broken_https_default_vhost
   ullmann:
     address: 206.12.19.141
     parents: ganeti2
@@ -995,10 +991,6 @@ servers:
     address: 206.12.19.142
     parents: ganeti2
     hostgroups: computers, service, kvmdomains, jessie, nfs-client, autofs
-  menotti:
-    address: 206.12.19.143
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https
   muffat:
     address: 206.12.19.146
     parents: ganeti2
@@ -1059,6 +1051,14 @@ servers:
     address: 209.87.16.27
     parents: ubc-gateway
     hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, heavy-exim
+  diabelli:
+    address: 209.87.16.28
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, broken_https_default_vhost
+  menotti:
+    address: 209.87.16.29
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https
   # }}}
   # {{{ gw-umn
   #saens: