move internal wiki
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Simon Marsh 2023-09-20 18:26:50 +01:00
parent 58a94bfffe
commit 4cbfd3bb29
Signed by: burble
GPG Key ID: E9B4156C1659C079
2 changed files with 23 additions and 18 deletions

View File

@ -54,7 +54,6 @@ D_EXTEND(
CNAME('explorer', cf_tun_de_fra1, CF_PROXY_ON), CNAME('explorer', cf_tun_de_fra1, CF_PROXY_ON),
CNAME('lg', cf_tun_de_fra1, CF_PROXY_ON), CNAME('lg', cf_tun_de_fra1, CF_PROXY_ON),
CNAME('git', cf_tun_de_fra1, CF_PROXY_ON), CNAME('git', cf_tun_de_fra1, CF_PROXY_ON),
CNAME('wiki', cf_tun_de_fra1, CF_PROXY_ON),
CNAME('grafana', cf_tun_de_fra1, CF_PROXY_ON), CNAME('grafana', cf_tun_de_fra1, CF_PROXY_ON),
CNAME('uptime', cf_tun_ch_zur1, CF_PROXY_ON), CNAME('uptime', cf_tun_ch_zur1, CF_PROXY_ON),
@ -63,6 +62,7 @@ D_EXTEND(
CNAME('paste', cf_tun_uk_lon1, CF_PROXY_ON), CNAME('paste', cf_tun_uk_lon1, CF_PROXY_ON),
CNAME('lounge', cf_tun_uk_lon1, CF_PROXY_ON), CNAME('lounge', cf_tun_uk_lon1, CF_PROXY_ON),
CNAME('wiki', cf_tun_uk_lon1, CF_PROXY_ON),
// fr-rbx1 redirect // fr-rbx1 redirect
CNAME('fr-rbx1', 'fr-par1.burble.com.'), CNAME('fr-rbx1', 'fr-par1.burble.com.'),

View File

@ -39,7 +39,7 @@ 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('wiki.service', 'fd42:4242:2601:ac00::10:1');
service('dn42regsrv', 'fd42:4242:2601:ac00::20: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('vault.service', 'fd42:4242:2601:acf0::20:1');
@ -67,34 +67,43 @@ D_EXTEND(
CNAME('explorer', 'envoy.burble.dn42.'), CNAME('explorer', 'envoy.burble.dn42.'),
CNAME('send', 'envoy.burble.dn42.'), CNAME('send', 'envoy.burble.dn42.'),
CNAME('vault', 'envoy.burble.dn42.'), CNAME('vault', 'envoy.burble.dn42.'),
CNAME('wdev', 'envoy.burble.dn42.'), CNAME('wdev', 'envoy.burble.dn42.')
CNAME('wiki', 'envoy.burble.dn42.')
); );
// docker services // docker services
D_EXTEND( D_EXTEND(
domain, domain,
CNAME('sshwifty', 'docker.tier1.de-fra1.burble.dn42.'), // CNAME('sshwifty', 'docker.tier1.de-fra1.burble.dn42.'),
// CNAME('paste', 'docker.tier1.de-fra1.burble.dn42.'), // CNAME('paste', 'docker.tier1.de-fra1.burble.dn42.'),
CNAME('uptime', 'docker.tier1.ch-zur1.burble.dn42.'), CNAME('uptime', 'docker.tier1.ch-zur1.burble.dn42.'),
CNAME('prometheus.tier2.ch-zur1', 'docker.tier2.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('prometheus.tier2.de-fra1', 'docker.tier2.de-fra1.burble.dn42.'),
CNAME('grafana.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.'), CNAME('wiki-sync-de-fra1', 'docker.tier1.de-fra1.burble.dn42.')
CNAME('wiki-sync-us-lax1', 'docker.tier1.us-lax1.burble.dn42.'),
CNAME('wiki-sync-us-nyc1', 'docker.tier1.us-nyc1.burble.dn42.')
); );
// nomad container services // nomad container services
D_EXTEND( D_EXTEND(
domain, domain,
CNAME('nomad', 'traefik-tier2.burble.dn42.'),
CNAME('whoami', 'traefik-eu.burble.dn42.'), // global anycast
CNAME('paste', 'traefik-eu.burble.dn42.'), CNAME('wiki', 'traefik.burble.dn42.'),
CNAME('wiki-ro', 'traefik-eu.burble.dn42.'),
CNAME('invidious', 'traefik-eu.burble.dn42.'), // eu services
CNAME('lounge', 'traefik-eu.burble.dn42.') 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('wiki-sync-uk-lon1', '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.')
); );
// other service cnames // other service cnames
@ -115,10 +124,6 @@ D_EXTEND(
CNAME('www', 'burble.dn42.'), CNAME('www', 'burble.dn42.'),
CNAME('git', 'git.de-fra1.burble.dn42.'), CNAME('git', 'git.de-fra1.burble.dn42.'),
// local service aliases
CNAME('wiki.fr', 'nginx.de-fra1.burble.dn42.'),
CNAME('wiki.ca', 'nginx.ca-bhs2.burble.dn42.'),
// host aliases // host aliases
CNAME('repo', 'repo.tier2.fr-par1.burble.dn42.'), CNAME('repo', 'repo.tier2.fr-par1.burble.dn42.'),
CNAME('borg', 'borg.tier2.fr-par2.burble.dn42.'), CNAME('borg', 'borg.tier2.fr-par2.burble.dn42.'),