diff --git a/domains/030-burble.dn42.js b/domains/030-burble.dn42.js index 783efe4..8d1f5b2 100644 --- a/domains/030-burble.dn42.js +++ b/domains/030-burble.dn42.js @@ -27,20 +27,26 @@ service('whois', 'fd42:4242:2601:ac43::1', '172.20.1 service('asterisk.fr-par1', 'fd42:4242:2601:36:216:3eff:fe8f:6211', '172.20.129.9'); service('shell', 'fd42:4242:2601:ac22::1', '172.20.129.10'); service('envoy', 'fd42:4242:2601:ac81::1', '172.20.129.11'); -// services 172.20.129.12 -> 172.20.129.25 are unassigned +service('traefik', 'fd42:4242:2601:ac82::1', '172.20.129.12'); +service('traefik-eu', 'fd42:4242:2601:ac83::1', '172.20.129.13'); +service('traefik-na', 'fd42:4242:2601:ac84::1', '172.20.129.14'); +// services 172.20.129.15 -> 172.20.129.25 are unassigned service('shell.us-nyc2', 'fd42:4242:2601:101d:216:3eff:fefc:722', '172.20.129.26'); service('shell.us-lax1', 'fd42:4242:2601:100a:216:3eff:fe5c:30b2', '172.20.129.27'); service('shell.fr-par1', 'fd42:4242:2601:1016:216:3eff:fe01:2f1f', '172.20.129.28'); service('shell.ca-bhs2', 'fd42:4242:2601:100d:216:3eff:fed7:2ceb', '172.20.129.30'); // internal anycasts -service('rpki', 'fd42:4242:2601:ac10::1'); -service('dns64', 'fd42:4242:2601:ac53::64'); -service('wiki.service', 'fd42:4242:2601:ac00::10:1'); -service('dn42regsrv', 'fd42:4242:2601:ac00::20:1'); -service('dns-slave', 'fd42:4242:2601:ac00::53:1'); -service('vault.service', 'fd42:4242:2601:acf0::20:1'); -service('ldap', 'fd42:4242:2601:acf0::60:1'); +service('rpki', 'fd42:4242:2601:ac10::1'); +service('dns64', 'fd42:4242:2601:ac53::64'); +service('wiki.service', 'fd42:4242:2601:ac00::10:1'); +service('dn42regsrv', 'fd42:4242:2601:ac00::20:1'); +service('dns-slave', 'fd42:4242:2601:ac00::53:1'); +service('vault.service', 'fd42:4242:2601:acf0::20:1'); +service('ldap', 'fd42:4242:2601:acf0::60:1'); +service('traefik-tier2', 'fd42:4242:2601:acf0::70:1'); +service('traefik-eu-tier2', 'fd42:4242:2601:acf0::75:1'); +service('traefik-na-tier2', 'fd42:4242:2601:acf0::76:1'); // proxied services //proxied('explorer'); @@ -86,11 +92,11 @@ D_EXTEND( // nomad container services D_EXTEND( domain, - CNAME('nomad', 'traefik.tier2.de-fra1.burble.dn42.'), - CNAME('whoami', 'traefik.de-fra1.burble.dn42.'), - CNAME('paste', 'traefik.de-fra1.burble.dn42.'), - CNAME('wiki-ro', 'traefik.de-fra1.burble.dn42.'), - CNAME('invidious', 'traefik.de-fra1.burble.dn42.') + CNAME('nomad', 'traefik.burble.dn42.'), + CNAME('whoami', 'traefik-eu.burble.dn42.'), + CNAME('paste', 'traefik-eu.burble.dn42.'), + CNAME('wiki-ro', 'traefik-eu.burble.dn42.'), + CNAME('invidious', 'traefik-eu.burble.dn42.') ); // other service cnames diff --git a/dynamic/virtual.js b/dynamic/virtual.js index 6e7f82c..bb630de 100644 --- a/dynamic/virtual.js +++ b/dynamic/virtual.js @@ -1,7 +1,5 @@ var virtual = [ // insert here - [ 'traefik.us-lax1', 'fd42:4242:2601:2a:3220:e6ff:fed9:81d9' ], - [ 'traefik.us-nyc1', 'fd42:4242:2601:29: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' ], [ 'containerd.tier2.us-nyc1', 'fd42:4242:2601:2902:9279:c8ff:fe7d:dbdd' ], @@ -19,10 +17,14 @@ var virtual = [ [ 'nomad.tier2.fr-par1', 'fd42:4242:2601:3602:12cd:cfff:fece:ba47' ], [ 'nomad.tier2.ch-zur2', 'fd42:4242:2601:2702:12cd:cfff:fece:ba47' ], [ 'nomad.tier2.de-fra1', 'fd42:4242:2601:3102:12cd:cfff:fece:ba47' ], - [ 'traefik.de-fra1', 'fd42:4242:2601:31:3220:e6ff:fed9:81d9' ], + [ 'traefik.de-fra1', 'fd42:4242:2601:31:3220:e6ff:fed9:81d9' ], + [ 'traefik.tier2.de-fra1', 'fd42:4242:2601:3102:3220:e6ff:fed9:81d9' ], [ 'traefik.fr-par1', 'fd42:4242:2601:36:3220:e6ff:fed9:81d9' ], - [ 'traefik.tier2.fr-par1', 'fd42:4242:2601:3602:3220:e6ff:fed9:81d9' ], - [ 'traefik.tier2.de-fra1', 'fd42:4242:2601:3102:3220:e6ff:fed9:81d9' ], + [ 'traefik.tier2.fr-par1', 'fd42:4242:2601:3602:3220:e6ff:fed9:81d9' ], + [ 'traefik.us-lax1', 'fd42:4242:2601:2a:3220:e6ff:fed9:81d9' ], + [ 'traefik.tier2.us-lax1', 'fd42:4242:2601:2a02:3220:e6ff:fed9:81d9' ], + [ 'traefik.us-nyc1', 'fd42:4242:2601:29:3220:e6ff:fed9:81d9' ], + [ 'traefik.tier2.us-nyc1', 'fd42:4242:2601:2902:3220:e6ff:fed9:81d9' ], [ 'spawn.tier2.fr-par1', 'fd42:4242:2601:3602:84c4:20ff:fe86:ef71' ], [ 'registry.tier2.de-fra2', 'fd42:4242:2601:2b02:216:3eff:fe36:d502' ], [ 'envoy.de-fra1', 'fd42:4242:2601:31:c203:beff:fe96:81a2' ],