more traefik moves
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Simon Marsh 2023-09-27 16:15:54 +01:00
parent 9aed15cb1c
commit c6edc0e959
Signed by: burble
GPG Key ID: E9B4156C1659C079

View File

@ -26,7 +26,7 @@ service('rproxy', 'fd42:4242:2601:acf0::1', '172.20.1
service('whois', 'fd42:4242:2601:ac43::1', '172.20.129.8'); service('whois', 'fd42:4242:2601:ac43::1', '172.20.129.8');
service('asterisk.fr-par1', 'fd42:4242:2601:36:216:3eff:fe8f:6211', '172.20.129.9'); 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('shell', 'fd42:4242:2601:ac22::1', '172.20.129.10');
//service('envoy', 'fd42:4242:2601:ac81::1', '172.20.129.11'); // 11 was envoy
service('traefik', 'fd42:4242:2601:ac82::1', '172.20.129.12'); 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-eu', 'fd42:4242:2601:ac83::1', '172.20.129.13');
service('traefik-na', 'fd42:4242:2601:ac84::1', '172.20.129.14'); service('traefik-na', 'fd42:4242:2601:ac84::1', '172.20.129.14');
@ -39,48 +39,21 @@ service('shell.ca-bhs2', 'fd42:4242:2601:100d:216:3eff:fed7:2ceb', '172.20.1
// internal anycasts // internal anycasts
service('rpki', 'fd42:4242:2601:ac10::1'); service('rpki', 'fd42:4242:2601:ac10::1');
service('dns64', 'fd42:4242:2601:ac53::64'); 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('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('ldap', 'fd42:4242:2601:acf0::60:1');
service('traefik-tier2', 'fd42:4242:2601:acf0::70:1'); service('traefik-tier2', 'fd42:4242:2601:acf0::70:1');
service('traefik-eu-tier2', 'fd42:4242:2601:acf0::75:1'); service('traefik-eu-tier2', 'fd42:4242:2601:acf0::75:1');
service('traefik-na-tier2', 'fd42:4242:2601:acf0::76:1'); service('traefik-na-tier2', 'fd42:4242:2601:acf0::76:1');
// proxied services // proxied services
//proxied('glass');
//proxied('lg');
//proxied('grafana');
proxied('tasks'); proxied('tasks');
proxied('ldap-admin'); proxied('ldap-admin');
proxied('svc'); proxied('svc');
proxied('clicker');
proxied('minio');
proxied('s3');
proxied('anycast');
// envoy services
//D_EXTEND(
// domain,
// 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 // docker services
D_EXTEND( D_EXTEND(
domain, domain,
// CNAME('sshwifty', 'docker.tier1.de-fra1.burble.dn42.'),
// CNAME('paste', 'docker.tier1.de-fra1.burble.dn42.'),
// CNAME('uptime', 'docker.tier1.ch-zur1.burble.dn42.'),
// CNAME('prometheus.tier2.ch-zur1', 'docker.tier2.ch-zur1.burble.dn42.'),
// CNAME('prometheus.tier2.de-fra1', 'docker.tier2.de-fra1.burble.dn42.'),
// CNAME('grafana.tier2.de-fra1', 'docker.tier2.de-fra1.burble.dn42.'),
CNAME('drone.tier2.fr-par1', 'docker.tier2.fr-par1.burble.dn42.') CNAME('drone.tier2.fr-par1', 'docker.tier2.fr-par1.burble.dn42.')
// CNAME('wiki-sync-de-fra1', 'docker.tier1.de-fra1.burble.dn42.')
); );
// nomad container services // nomad container services
@ -90,6 +63,8 @@ D_EXTEND(
// global anycast // global anycast
CNAME('wiki', 'traefik.burble.dn42.'), CNAME('wiki', 'traefik.burble.dn42.'),
CNAME('explorer', 'traefik.burble.dn42.'), CNAME('explorer', 'traefik.burble.dn42.'),
CNAME('clicker', 'traefik.burble.dn42.'),
CNAME('anycast', 'traefik.burble.dn42.'),
// eu services // eu services
CNAME('invidious', 'traefik-eu.burble.dn42.'), CNAME('invidious', 'traefik-eu.burble.dn42.'),
@ -97,6 +72,8 @@ D_EXTEND(
CNAME('glass', 'traefik-eu.burble.dn42.'), CNAME('glass', 'traefik-eu.burble.dn42.'),
CNAME('lg', 'traefik-eu.burble.dn42.'), CNAME('lg', 'traefik-eu.burble.dn42.'),
CNAME('lounge', 'traefik-eu.burble.dn42.'), CNAME('lounge', 'traefik-eu.burble.dn42.'),
CNAME('minio', 'traefik-eu.burble.dn42.'),
CNAME('s3', 'traefik-eu.burble.dn42.'),
CNAME('paste', 'traefik-eu.burble.dn42.'), CNAME('paste', 'traefik-eu.burble.dn42.'),
CNAME('wiki-sync-uk-lon1', 'traefik-eu.burble.dn42.'), CNAME('wiki-sync-uk-lon1', 'traefik-eu.burble.dn42.'),
CNAME('whoami', 'traefik-eu.burble.dn42.'), CNAME('whoami', 'traefik-eu.burble.dn42.'),
@ -111,7 +88,11 @@ D_EXTEND(
CNAME('prometheus', 'traefik-tier2.burble.dn42.'), CNAME('prometheus', 'traefik-tier2.burble.dn42.'),
CNAME('prometheus-ingest', 'traefik-tier2.burble.dn42.'), CNAME('prometheus-ingest', 'traefik-tier2.burble.dn42.'),
CNAME('vault', 'traefik-tier2.burble.dn42.'), CNAME('vault', 'traefik-tier2.burble.dn42.'),
CNAME('wdev', 'traefik-tier2.burble.dn42.') CNAME('wdev', 'traefik-tier2.burble.dn42.'),
// special cases
CNAME('dialup', 'traefik-t1.fr-par1.burble.dn42.')
); );
// other service cnames // other service cnames