From 53f2b69a4cf81b8598c1c70119bde716f00bb902 Mon Sep 17 00:00:00 2001 From: Simon Marsh Date: Sat, 14 Sep 2024 10:54:03 +0100 Subject: [PATCH] tmp --- domains/030-burble.dn42.js | 5 ++--- dynamic/nodes.js | 4 ++-- dynamic/virtual.js | 20 +++++++++++--------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/domains/030-burble.dn42.js b/domains/030-burble.dn42.js index 3872dda..a526c43 100644 --- a/domains/030-burble.dn42.js +++ b/domains/030-burble.dn42.js @@ -90,7 +90,7 @@ D_EXTEND( CNAME('lounge', 'traefik.burble.dn42.'), CNAME('paste', 'traefik.burble.dn42.'), CNAME('whoami', 'traefik.burble.dn42.'), - CNAME('minio', 'traefik.burble.dn42.'), + CNAME('minio', 'traefik-eu.burble.dn42.'), CNAME('s3', 'traefik.burble.dn42.'), CNAME('acme', 'traefik.burble.dn42.'), CNAME('svc', 'traefik.burble.dn42.'), @@ -136,8 +136,7 @@ D_EXTEND( // global service aliases CNAME('www', 'burble.dn42.'), CNAME('git', 'git.de-fra2.burble.dn42.'), - CNAME('mail', 'mail.tier2.uk-lon4.burble.dn42.'), - CNAME('factorio', 'factorio.nl-ams3.burble.dn42.'), + CNAME('mail', 'mail.tier2.uk-lon1.burble.dn42.'), // grc SSHFP SSHFP('grc', 4, 1, 'ff61153c18334e89df3b4b4e4696306eeb5ffe9c'), diff --git a/dynamic/nodes.js b/dynamic/nodes.js index 4069bc2..4b20e2b 100644 --- a/dynamic/nodes.js +++ b/dynamic/nodes.js @@ -11,8 +11,8 @@ var nodes = [ [ 'us-lax1', '45.67.219.3', '2a04:bdc7:100:4656::1', 'true', 10, '172.20.129.172' ], [ 'de-fra2', '178.251.228.112', '2a09:bfc7:0:7100::1', 'true', 11, '172.20.129.171' ], [ 'de-fra3', '45.158.9.213', '2a12:bec0:153:e::a', 'true', 12, '172.20.129.170' ], - // [ '', '', '', 'true', 13, '172.20.129.167' ], - [ 'uk-lon2', '150.107.201.114', '2a0e:dc0:5:dc62::1', 'true', 14, '172.20.129.166' ], + [ 'se-sto1', '176.126.84.199', '2a0e:dc0:2:1e93::1', 'true', 13, '172.20.129.167' ], + [ 'uk-lon2', '150.107.201.114', '2a0e:dc0:5:4f24::1', 'true', 14, '172.20.129.166' ], [ 'uk-lon3', '150.107.201.105', '2a0e:dc0:5:d2dd::1', 'true', 16, '172.20.129.184' ], [ 'de-fra1', '5.180.253.211', '2a0e:6a80:3:430::1', 'true', 17, '172.20.129.169' ], [ 'nl-ams1', '176.126.85.61', '2a01:6f0:ffff:68a4::1', 'true', 18, '172.20.129.186' ], diff --git a/dynamic/virtual.js b/dynamic/virtual.js index 9568974..46a7558 100644 --- a/dynamic/virtual.js +++ b/dynamic/virtual.js @@ -1,5 +1,15 @@ var virtual = [ // insert here + [ 'nomad.tier2.uk-lon1', 'fd42:4242:2601:3502:12cd:cfff:fece:ba47' ], + [ 'vault.tier2.uk-lon1', 'fd42:4242:2601:3502:b267:51ff:feed:503f' ], + [ 'dns-edge.se-sto1', 'fd42:4242:2601:2d:d2f4:8ff:fec6:c157' ], + [ 'traefik-t1.de-fra1', 'fd42:4242:2601:31:3220:e6ff:fed9:81d9' ], + [ 'traefik-t1.fr-par1', 'fd42:4242:2601:36:3220:e6ff:fed9:81d9' ], + [ 'traefik-t1.us-nyc1', 'fd42:4242:2601:29:3220:e6ff:fed9:81d9' ], + [ 'traefik-t1.us-lax1', 'fd42:4242:2601:2a:3220:e6ff:fed9:81d9' ], + [ 'traefik-t1.uk-lon1', 'fd42:4242:2601:35:3220:e6ff:fed9:81d9' ], + [ 'traefik-t1.ch-zur1', 'fd42:4242:2601:28:3220:e6ff:fed9:81d9' ], + [ 'dockerd.tier2.de-fra2', 'fd42:4242:2601:2b02:a291:c4ff:fe09:d205' ], [ 'containerd.tier2.fr-par2', 'fd42:4242:2601:3e02:9279:c8ff:fe7d:dbdd' ], [ 'dns-edge.fr-par2', 'fd42:4242:2601:3e:d2f4:8ff:fec6:c157' ], [ 'styx.tier2.us-nyc3', 'fd42:4242:2601:3a02:216:3eff:fe87:3e3a' ], @@ -13,12 +23,8 @@ var virtual = [ [ 'dns-edge.nl-ams3', 'fd42:4242:2601:3c:d2f4:8ff:fec6:c157' ], [ 'dns-recursor.tier2.uk-lon1', 'fd42:4242:2601:3502:62b5:41ff:fe65:8e3' ], [ 'dns-secondary.uk-lon1', 'fd42:4242:2601:35:9293:33ff:fe69:c7f2' ], - [ 'traefik-t1.uk-lon1', 'fd42:4242:2601:35:3220:e6ff:fed9:81d9' ], - [ 'traefik-t1.ch-zur1', 'fd42:4242:2601:28:3220:e6ff:fed9:81d9' ], [ 'dns-recursor.tier2.de-fra1', 'fd42:4242:2601:3102:62b5:41ff:fe65:8e3' ], [ 'dns-secondary.de-fra1', 'fd42:4242:2601:31:9293:33ff:fe69:c7f2' ], - [ 'dockerd.tier2.de-fra2', 'fd42:4242:2601:2b02:a291:c4ff:fe09:d205' ], - [ 'traefik-t1.de-fra1', 'fd42:4242:2601:31:3220:e6ff:fed9:81d9' ], [ 'dns-dns64.de-fra1', 'fd42:4242:2601:31:42ef:47ff:feb6:6c44' ], [ 'dns-dns64.fr-par1', 'fd42:4242:2601:36:42ef:47ff:feb6:6c44' ], [ 'dns-dns64.no-trd1', 'fd42:4242:2601:39:42ef:47ff:feb6:6c44' ], @@ -31,7 +37,6 @@ var virtual = [ [ 'dns-dns64.us-nyc1', 'fd42:4242:2601:29:42ef:47ff:feb6:6c44' ], [ 'dns-recursor.tier2.us-nyc1', 'fd42:4242:2601:2902:62b5:41ff:fe65:8e3' ], [ 'dns-recursor.tier2.us-lax1', 'fd42:4242:2601:2a02:62b5:41ff:fe65:8e3' ], - [ 'traefik-t1.us-lax1', 'fd42:4242:2601:2a:3220:e6ff:fed9:81d9' ], [ 'dns-edge.us-nyc2', 'fd42:4242:2601:3d:d2f4:8ff:fec6:c157' ], [ 'containerd.tier2.us-lax2', 'fd42:4242:2601:3802:9279:c8ff:fe7d:dbdd' ], [ 'containerd.tier2.us-nyc3', 'fd42:4242:2601:3a02:9279:c8ff:fe7d:dbdd' ], @@ -53,6 +58,7 @@ var virtual = [ [ 'containerd.tier2.nl-ams2', 'fd42:4242:2601:3402:9279:c8ff:fe7d:dbdd' ], [ 'dns-edge.nl-ams2', 'fd42:4242:2601:34:d2f4:8ff:fec6:c157' ], [ 'mail.tier2.uk-lon4', 'fd42:4242:2601:2502:216:3eff:fe68:6f6a' ], + [ 'mail.tier2.uk-lon1', 'fd42:4242:2601:3502:216:3eff:fe68:6f6a' ], [ 'dns-master.us-nyc2', 'fd42:4242:2601:3d:216:3eff:fe97:45a4' ], [ 'dockerd.tier2.fr-par1', 'fd42:4242:2601:3602:a291:c4ff:fe09:d205' ], [ 'dockerd.tier2.de-fra3', 'fd42:4242:2601:2c02:a291:c4ff:fe09:d205' ], @@ -64,8 +70,6 @@ var virtual = [ [ 'acme.tier2.fr-par1', 'fd42:4242:2601:3602:4285:15ff:feee:d66c' ], [ 'acme.tier2.de-fra1', 'fd42:4242:2601:3102:4285:15ff:feee:d66c' ], [ 'acme.tier2.ch-zur2', 'fd42:4242:2601:2702:4285:15ff:feee:d66c' ], - [ 'traefik-t1.us-nyc1', 'fd42:4242:2601:29:3220:e6ff:fed9:81d9' ], - [ 'traefik-t1.fr-par1', 'fd42:4242:2601:36:3220:e6ff:fed9:81d9' ], [ 'traefik-t1.tier2.uk-lon1', 'fd42:4242:2601:3502:3220:e6ff:fed9:81d9' ], [ 'traefik-t1.tier2.ch-zur1', 'fd42:4242:2601:2802:3220:e6ff:fed9:81d9' ], [ 'traefik-t1.tier2.fr-par1', 'fd42:4242:2601:3602:3220:e6ff:fed9:81d9' ], @@ -154,8 +158,6 @@ var virtual = [ [ 'dns-edge.de-fra1', 'fd42:4242:2601:31:d2f4:8ff:fec6:c157' ], [ 'dns-edge.no-trd1', 'fd42:4242:2601:39:d2f4:8ff:fec6:c157' ], [ 'git.de-fra2', 'fd42:4242:2601:2b:3246:4eff:fe04:fd8b' ], - [ 'mail-dn42dev.tier2.ca-bhs2', 'fd42:4242:2601:2d02:820c:f8ff:fe15:3ce0' ], - [ 'mail-dn42dev.tier2.de-fra1', 'fd42:4242:2601:3102:820c:f8ff:fe15:3ce0' ], [ 'dns-slave.tier2.de-fra1', 'fd42:4242:2601:3102:a25e:b7ff:feea:64ed' ], [ 'mysql.tier2.de-fra1', 'fd42:4242:2601:3102:6291:1fff:fe63:f812' ], [ 'vault.tier2.de-fra1', 'fd42:4242:2601:3102:b267:51ff:feed:503f' ],