X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=101cfb6d37a819e8217223bf74c2eb9ff9f3f06e;hb=548f9b8a1cbeb6adf28a1e325c4a479cfb3a6576;hp=9c00c917c0a46e0c7223140351c0c8e70102b559;hpb=36210ec7713655fb79c1a2d272e1555623c17bd9;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 9c00c91..101cfb6 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -361,10 +361,6 @@ servers:
     address: 5.153.231.12
     parents: ganeti-bytemark
     hostgroups: computers, hassrvfs, kvmdomains, buster, systemd-timesyncd
-  philp:
-    address: 5.153.231.13
-    parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, stretch, apache2-hosts, apache-https, systemd-timesyncd, broken_https_default_vhost
   rainier:
     address: 5.153.231.16
     parents: ganeti-bytemark
@@ -377,10 +373,6 @@ servers:
     address: 5.153.231.17
     parents: ganeti-bytemark
     hostgroups: computers, hassrvfs, kvmdomains, buster, apache2-hosts, apache-https, nfs-client, autofs, systemd-timesyncd
-  wuiet:
-    address: 5.153.231.18
-    parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, stretch, service, apache-https, apache2-hosts, heavy-exim, systemd-timesyncd
   dinis:
     address: 5.153.231.19
     parents: ganeti-bytemark
@@ -736,7 +728,7 @@ servers:
   handel:
     address: 82.195.75.104
     parents: ganeti-manda
-    hostgroups: computers, service, kvmdomains, apache2-hosts, stretch, postgres96-hosts, hassrvfs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, apache2-hosts, buster, postgres11-hosts, hassrvfs, systemd-timesyncd
   kaufmann:
     address: 82.195.75.107
     parents: ganeti-manda
@@ -1022,6 +1014,14 @@ servers:
     address: 209.87.16.49
     parents: ganeti2-ubc
     hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
+  wuiet:
+    address: 209.87.16.60
+    parents: ganeti2-ubc
+    hostgroups: computers, general, kvmdomains, stretch, service, apache-https, apache2-hosts, heavy-exim, systemd-timesyncd
+  philp:
+    address: 209.87.16.61
+    parents: ganeti2-ubc
+    hostgroups: computers, hassrvfs, kvmdomains, stretch, apache2-hosts, apache-https, systemd-timesyncd, broken_https_default_vhost
 
   ganeti3-ubc:
     address: 209.87.16.50
@@ -1122,7 +1122,7 @@ servers:
   new-klecker:
     address: 130.89.148.77
     parents: gw-utwente
-    hostgroups: computers, service, buster, r540, manyprocesses, incomingmailrelayed2025, physical_x86_intel, hassrvfs
+    hostgroups: computers, service, buster, r540, manyprocesses, incomingmailrelayed2025, physical_x86_intel, hassrvfs, apache2-hosts, apache-https
   smit:
     address: 130.89.148.78
     parents: gw-utwente