From 3025ef4c22ec691f72a1edee1143890f74fea46f Mon Sep 17 00:00:00 2001 From: Simon Marsh Date: Wed, 20 Sep 2023 20:10:47 +0100 Subject: [PATCH] move to services to traefik --- domains/030-burble.dn42.js | 20 ++++++++++++-------- dynamic/virtual.js | 10 +++++----- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/domains/030-burble.dn42.js b/domains/030-burble.dn42.js index 97691ef..a002f91 100644 --- a/domains/030-burble.dn42.js +++ b/domains/030-burble.dn42.js @@ -63,11 +63,11 @@ proxied('anycast'); // envoy services D_EXTEND( domain, - CNAME('ci', 'envoy.burble.dn42.'), - CNAME('explorer', 'envoy.burble.dn42.'), - CNAME('send', 'envoy.burble.dn42.'), - CNAME('vault', 'envoy.burble.dn42.'), - CNAME('wdev', 'envoy.burble.dn42.') +// CNAME('ci', 'envoy.burble.dn42.'), + CNAME('send', 'envoy.burble.dn42.') +// CNAME('explorer', 'envoy.burble.dn42.'), +// CNAME('vault', 'envoy.burble.dn42.'), +// CNAME('wdev', 'envoy.burble.dn42.') ); // docker services @@ -90,20 +90,24 @@ D_EXTEND( // global anycast CNAME('wiki', 'traefik.burble.dn42.'), + CNAME('explorer', 'traefik.burble.dn42.'), // eu services - CNAME('whoami', 'traefik-eu.burble.dn42.'), - CNAME('paste', 'traefik-eu.burble.dn42.'), CNAME('invidious', 'traefik-eu.burble.dn42.'), CNAME('lounge', 'traefik-eu.burble.dn42.'), + CNAME('paste', 'traefik-eu.burble.dn42.'), CNAME('wiki-sync-uk-lon1', 'traefik-eu.burble.dn42.'), + CNAME('whoami', 'traefik-eu.burble.dn42.'), // na services CNAME('wiki-sync-us-lax1', 'traefik-na.burble.dn42.'), CNAME('wiki-sync-us-nyc1', 'traefik-na.burble.dn42.'), // internal services - CNAME('nomad', 'traefik-tier2.burble.dn42.') + CNAME('ci', 'traefik-tier2.burble.dn42.'), + CNAME('nomad', 'traefik-tier2.burble.dn42.'), + CNAME('vault', 'traefik-tier2.burble.dn42.'), + CNAME('wdev', 'traefik-tier2.burble.dn42.') ); // other service cnames diff --git a/dynamic/virtual.js b/dynamic/virtual.js index dc9404e..20c35ce 100644 --- a/dynamic/virtual.js +++ b/dynamic/virtual.js @@ -1,17 +1,17 @@ var virtual = [ // insert here - [ 'traefik-t1.uk-lon1', 'fd42:4242:2601:35:3220:e6ff:fed9:81d9' ], + [ 'traefik-t1.us-lax1', 'fd42:4242:2601:2a:3220:e6ff:fed9:81d9' ], + [ 'traefik-t1.us-nyc1', 'fd42:4242:2601:29:3220:e6ff:fed9:81d9' ], + [ 'traefik-t1.de-fra1', 'fd42:4242:2601:31:3220:e6ff:fed9:81d9' ], + [ 'traefik-t1.uk-lon1', 'fd42:4242:2601:35: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-t2.tier2.uk-lon1', 'fd42:4242:2601:3502:8215:bff:fe36:bf00' ], - [ 'traefik-t1.fr-par1', 'fd42:4242:2601:36:3220:e6ff:fed9:81d9' ], [ 'traefik-t1.tier2.fr-par1', 'fd42:4242:2601:3602:3220:e6ff:fed9:81d9' ], [ 'traefik-t2.tier2.fr-par1', 'fd42:4242:2601:3602:8215:bff:fe36:bf00' ], - [ 'traefik-t1.de-fra1', 'fd42:4242:2601:31:3220:e6ff:fed9:81d9' ], [ 'traefik-t1.tier2.de-fra1', 'fd42:4242:2601:3102:3220:e6ff:fed9:81d9' ], [ 'traefik-t2.tier2.de-fra1', 'fd42:4242:2601:3102:8215:bff:fe36:bf00' ], - [ 'traefik-t1.us-nyc1', 'fd42:4242:2601:29:3220:e6ff:fed9:81d9' ], [ 'traefik-t1.tier2.us-nyc1', 'fd42:4242:2601:2902:3220:e6ff:fed9:81d9' ], - [ 'traefik-t1.us-lax1', 'fd42:4242:2601:2a:3220:e6ff:fed9:81d9' ], [ 'traefik-t1.tier2.us-lax1', 'fd42:4242:2601:2a02:3220:e6ff:fed9:81d9' ], [ 'nomad.tier2.us-nyc1', 'fd42:4242:2601:2902:12cd:cfff:fece:ba47' ], [ 'containerd.tier2.us-nyc2', 'fd42:4242:2601:3d02:9279:c8ff:fe7d:dbdd' ],