From 507fe1a7601e6d2733d5df8ac9630cfd281adb4e Mon Sep 17 00:00:00 2001
From: Simon Marsh <simon@burble.com>
Date: Sun, 29 Dec 2024 11:05:23 +0000
Subject: [PATCH] tidy up

---
 domains/030-burble.dn42.js |  2 +-
 dynamic/virtual.js         | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/domains/030-burble.dn42.js b/domains/030-burble.dn42.js
index 8a9efeb..4599cae 100644
--- a/domains/030-burble.dn42.js
+++ b/domains/030-burble.dn42.js
@@ -86,7 +86,7 @@ D_EXTEND(
     CNAME('clicker',           'traefik.burble.dn42.'),
     CNAME('anycast',           'traefik.burble.dn42.'),
     CNAME('invidious',         'traefik.burble.dn42.'),
-    CNAME('grafana',           'traefik-v2.burble.dn42.'),
+    CNAME('grafana',           'traefik.burble.dn42.'),
     CNAME('glass',             'traefik.burble.dn42.'),
     CNAME('lg',                'traefik.burble.dn42.'),
     CNAME('lounge',            'traefik.burble.dn42.'),
diff --git a/dynamic/virtual.js b/dynamic/virtual.js
index e36dae5..656c4c0 100644
--- a/dynamic/virtual.js
+++ b/dynamic/virtual.js
@@ -65,6 +65,7 @@ var virtual = [
     [ 'traefik-v2.tier2.se-sto1', 'fd42:4242:2601:2d02:4290:5fff:fecd:eeb8' ],
 
     [ 'traefik-tier2.tier2.fr-rbx1', 'fd42:4242:2601:2602:c2f9:1fff:fe7d:ee8c' ],
+    [ 'traefik-tier2.tier2.de-fra2', 'fd42:4242:2601:2b02:c2f9:1fff:fe7d:ee8c' ],
 
     [ 'traefik-infra.tier2.fr-gra1', 'fd42:4242:2601:3f02:5297:7ff:fe3f:57e7' ],
     [ 'traefik-infra.tier2.fr-rbx1', 'fd42:4242:2601:2602:5297:7ff:fe3f:57e7' ],
@@ -74,18 +75,14 @@ var virtual = [
     [ 'containerd.tier2.se-sto1', 'fd42:4242:2601:2d02:e227:c2ff:fe6e:1548' ],
     [ 'containerd.tier2.uk-lon1', 'fd42:4242:2601:3502:e227:c2ff:fe6e:1548' ],
     [ 'containerd.tier2.de-fra1', 'fd42:4242:2601:3102:e227:c2ff:fe6e:1548' ],
+    [ 'containerd.tier2.de-fra2', 'fd42:4242:2601:2b02:e227:c2ff:fe6e:1548' ],
 
     [ 'dockerd.tier2.fr-rbx1', 'fd42:4242:2601:2602:92bb:c9ff:fe53:c957' ],
 
     [ 'containerd-dev.tier2.fr-gra1', 'fd42:4242:2601:3f02:92ea:d7ff:fe27:e94e' ],
     [ 'containerd-host.tier2.se-sto1', 'fd42:4242:2601:2d02:f2da:93ff:fee0:97fa' ],
 
-    // nomad
-    [ 'nomad.tier2.uk-lon1', 'fd42:4242:2601:3502:12cd:cfff:fece:ba47' ],
-    [ 'nomad.tier2.fr-par1', 'fd42:4242:2601:3602:12cd:cfff:fece:ba47' ],
-    [ 'nomad.tier2.de-fra1', 'fd42:4242:2601:3102:12cd:cfff:fece:ba47' ],
-
-    // vault
+    // legacy bdn42 vault
     [ 'vault.tier2.uk-lon1', 'fd42:4242:2601:3502:b267:51ff:feed:503f' ],
     [ 'vault.tier2.de-fra2', 'fd42:4242:2601:2b02:b267:51ff:feed:503f' ],
     [ 'vault.tier2.fr-par1', 'fd42:4242:2601:3602:b267:51ff:feed:503f' ],
@@ -100,7 +97,6 @@ var virtual = [
     [ 'dns-secondary.de-fra1', 'fd42:4242:2601:31:9293:33ff:fe69:c7f2' ],
     [ 'dns-secondary.us-lax1', 'fd42:4242:2601:2a:9293:33ff:fe69:c7f2' ],
     [ 'dns-secondary.us-nyc1', 'fd42:4242:2601:29:9293:33ff:fe69:c7f2' ],
-    [ 'dns-secondary.tier2.de-fra2', 'fd42:4242:2601:2b02:9293:33ff:fe69:c7f2' ],
 
     [ 'dns-recursor.tier2.uk-lon1', 'fd42:4242:2601:3502:62b5:41ff:fe65:8e3' ],
     [ 'dns-recursor.tier2.de-fra1', 'fd42:4242:2601:3102:62b5:41ff:fe65:8e3' ],
@@ -139,6 +135,8 @@ var virtual = [
 
     // ldap
     [ 'ldap-slave.us-nyc2', 'fd42:4242:2601:3d:7222:61ff:fec9:5bd0' ],
+    [ 'ldap-slave.us-lax1', 'fd42:4242:2601:2a:7222:61ff:fec9:5bd0' ],
+    [ 'ldap-slave.fr-par1', 'fd42:4242:2601:36:7222:61ff:fec9:5bd0' ],
     [ 'ldap-master.tier2.de-fra1', 'fd42:4242:2601:3102:2203:43ff:feae:28bb' ],
 
     // network