X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=2f484bf2613fb55ee3d88698e5fb33a6807cdc9c;hb=bd0890b87d551851ba90a7cfe3827120d0a4581d;hp=9e03cd46e8f7ef3cb6deea84f2b3422ac9e58aa4;hpb=0ef7364d5cb22cb2517f6e75c988603f0f3a9e3f;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 9e03cd4..2f484bf 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
@@ -417,10 +413,6 @@ servers:
     address: 5.153.231.34
     parents: ganeti-bytemark
     hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
-  lindsay:
-    address: 5.153.231.36
-    parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, buster, autofs, nfs-client, systemd-timesyncd
   sor:
     address: 5.153.231.38
     parents: ganeti-bytemark
@@ -437,10 +429,6 @@ servers:
     address: 5.153.231.42
     parents: ganeti-bytemark
     hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, nfs-client, autofs, heavy-exim, systemd-timesyncd
-  rusca:
-    address: 5.153.231.43
-    parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
 
   casulana:
     address: 5.153.231.41
@@ -793,6 +781,10 @@ servers:
     address: 82.195.75.75
     parents: ganeti-manda
     hostgroups: computers, service, kvmdomains, buster, systemd-timesyncd
+  postgresql-manda-01:
+    address: 82.195.75.76
+    parents: ganeti-manda
+    hostgroups: computers, service, kvmdomains, hassrvfs, buster, systemd-timesyncd
   # }}}
   # {{{ gw-marist
   zani:
@@ -1020,8 +1012,16 @@ servers:
     hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
   wuiet:
     address: 209.87.16.60
-    parents: ganeti-bytemark
+    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
+  lindsay:
+    address: 209.87.16.62
+    parents: ganeti2-ubc
+    hostgroups: computers, service, kvmdomains, buster, autofs, nfs-client, systemd-timesyncd
 
   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