burble.dn42/dns
1
0
Fork 0
Code Releases Activity

add traefik-infra and tidy up
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Simon Marsh 2024-12-06 11:31:05 +00:00
parent a8bd7efac9
commit b209b74bf8
Signed by: burble
GPG Key ID: E9B4156C1659C079
3 changed files with 17 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
domains/030-burble.dn42.js
View File

@ -21,7 +21,7 @@ service('dns', 'fd42:4242:2601:ac53::53', '172.20.1
service('@', 'fd42:4242:2601:ac80::1', '172.20.129.3');
service('grc', 'fd42:4242:2601:ac12::1', '172.20.129.4');
service('pingable', 'fd42:4242:2601:ac05::1', '172.20.129.5');
service('nats', 'fd42:4242:2601:ac06::1', '172.20.129.6');
// 6 was nats
// 7 was rproxy
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');
@ -45,15 +45,13 @@ D_EXTEND(
CNAME('shell.uk-lon1', 'shell.uk.burble.dn42.'),
CNAME('shell.uk-lon2', 'shell.uk.burble.dn42.'),
CNAME('shell.uk-lon3', 'shell.uk.burble.dn42.'),
CNAME('shell.uk-lon4', 'shell.uk.burble.dn42.'),
CNAME('shell.uk-lon4', 'shell.uk.burble.dn42.'),
CNAME('shell.uk-lon5', 'shell.uk.burble.dn42.'),
CNAME('shell.fr-par1', 'shell.fr.burble.dn42.'),
CNAME('shell.de-fra1', 'shell.de.burble.dn42.'),
CNAME('shell.de-fra2', 'shell.de.burble.dn42.'),
CNAME('shell.de-fra3', 'shell.de.burble.dn42.'),
CNAME('shell.de-nue1', 'shell.de.burble.dn42.'),
CNAME('shell.us-nyc1', 'shell.nyc.burble.dn42.'),
CNAME('shell.us-nyc2', 'shell.nyc.burble.dn42.'),
@ -73,6 +71,7 @@ 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');
service('traefik-infra', 'fd42:4242:2601:acf0::80:1');
// nomad container services
D_EXTEND(
@ -109,12 +108,15 @@ D_EXTEND(
CNAME('ci', 'traefik-tier2.burble.dn42.'),
CNAME('ldap-admin', 'traefik-tier2.burble.dn42.'),
CNAME('nomad', 'traefik-tier2.burble.dn42.'),
CNAME('portainer', '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('wdev', 'traefik-tier2.burble.dn42.'),
// infra services
CNAME('v2', 'traefik-infra.burble.dn42.'),
CNAME('n2', 'traefik-infra.burble.dn42.'),
// special case
CNAME('dialup', 'traefik-t1.fr-par1.burble.dn42.')
);
@ -123,9 +125,6 @@ D_EXTEND(
D_EXTEND(
domain,
// temporary
CNAME('new-nats', 'nats.burble.dn42.'),
// evpn subdomain
NS('evpn', 'ns.de-fra1.evpn.burble.dn42.'),
NS('evpn', 'ns.ca-bhs2.evpn.burble.dn42.'),
@ -162,10 +161,10 @@ D_EXTEND(
// voip and modem dialup
CNAME('sip', 'asterisk.fr-par1.burble.dn42.'),
CNAME('voip', 'asterisk.fr-par1.burble.dn42.'),
CNAME('voip', 'asterisk.fr-par1.burble.dn42.'),
A('svcs.voip', '192.168.20.10'),
A('asterisk.voip', '192.168.20.11'),
A('sol.voip', '192.168.20.13'),
A('sol.voip', '192.168.20.13'),
A('pap2t.voip', '192.168.20.20'),
A('gstream.voip', '192.168.20.21'),
A('proxy.voip', '192.168.20.200'),
@ -194,11 +193,11 @@ D_EXTEND(
nodes.forEach(function(n) {
var hex = (n[4] + 32).toString(16);
var ip4 = (n[5] == 'undefined' ? undefined : n[5]);
// main IP
host(n[0],'fd42:4242:2601:'+hex+'::1', ip4);
// subnet IPs
host('tier1.'+n[0], 'fd42:4242:2601:'+hex+'::1');
host('tier1.'+n[0], 'fd42:4242:2601:'+hex+'::1');
host('tier2.'+n[0], 'fd42:4242:2601:'+hex+'02::1');
// create dn42-xxx CNAME for dn42 nodes
@ -215,4 +214,3 @@ virtual.forEach(function(v) {
//////////////////////////////////////////////////////////////////////////
// end of file

10
dynamic/nodes.js
View File

@ -1,12 +1,11 @@
var nodes = [
// 1 has no IPv4 address
// 2 has no IPv4 address
[ 'uk-red1', '2.58.203.147', '2a05:4140:19:91::a', 'false', 2, undefined ],
[ 'uk-cov1', '96.9.215.213', '2a0c:b840:2:1f::a', 'true', 3, '172.20.129.179' ],
[ 'uk-lon5', '194.29.101.115', '2a0e:dc0:5:6977::1', 'true', 4, '172.20.129.178' ],
[ 'uk-lon4', '150.107.201.44', '2a0e:dc0:5:821f::1', 'true', 5, '172.20.129.177' ],
[ 'fr-rbx1', '51.254.198.204', '2001:41d0:1008:acc::1', 'true', 6, '172.20.129.189' ],
// going
[ 'ch-zur2', '188.244.117.218', '2a0e:dc0:6:8::1', 'true', 7, '172.20.129.173' ],
// [ 'uk-lon6', '', '', 'true', 7, '172.20.129.173' ],
[ 'ch-zur1', '45.91.92.111', '2a0e:dc0:6:b2de::1', 'true', 8, '172.20.129.174' ],
[ 'us-nyc1', '109.205.61.36', '2605:4840:2:eed4::1', 'true', 9, '172.20.129.175' ],
[ 'us-lax1', '45.67.219.3', '2a04:bdc7:100:4656::1', 'true', 10, '172.20.129.172' ],
@ -18,10 +17,8 @@ var nodes = [
[ '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' ],
// 19 has no IPv4 address
// gone
[ 'nl-ams2', '31.41.249.236', '2a07:e042:1:56::1', 'true', 20, '172.20.129.168' ],
// [ '', '', '', 'true', 20, '172.20.129.168' ],
[ 'uk-lon1', '45.91.93.104', '2a0e:dc0:5:5::1', 'true', 21, '172.20.129.187' ],
// going
[ 'fr-par1', '51.159.194.131', '2001:bc8:1201:50d:d6ae:52ff:fecc:c97', 'true', 22, '172.20.129.188' ],
[ 'us-ash1', '173.249.195.195', '2607:9000:9000:10ae::a', 'true', 23, '172.20.129.181' ],
[ 'us-lax2', '31.220.30.46', '2a04:bdc7:100:1173::1', 'true', 24, '172.20.129.180' ],
@ -30,7 +27,6 @@ var nodes = [
// 27 has no IPv4 address
[ 'nl-ams3', '130.117.79.188', '2602:fcc0:5555:1:8c40:3ad1:b2c8:1', 'true', 28, '172.20.129.183' ],
[ 'us-nyc2', '109.205.61.64', '2605:4840:2:5abe::1', 'true', 29, '172.20.129.176' ],
// going
[ 'fr-par2', '51.158.36.207', '2001:bc8:1201:712:fabc:12ff:fe48:ec7c', 'true', 30, '172.20.129.182' ],
[ 'fr-gra1', '51.38.41.47', '2001:41d0:303:682f::1', 'true', 31, '172.20.129.164' ]
];

24
dynamic/virtual.js
View File

@ -1,7 +1,8 @@
var virtual = [
// insert here
[ 'traefik-infra.tier2.fr-gra1', 'fd42:4242:2601:3f02:5297:7ff:fe3f:57e7' ],
[ 'traefik-infra.tier2.fr-rbx1', 'fd42:4242:2601:2602:5297:7ff:fe3f:57e7' ],
[ 'traefik-infra.tier2.fr-rbx1', 'fd42:4242:2601:2602:5297:7ff:fe3f:57e7' ],
[ 'dns-edge.us-ash1', 'fd42:4242:2601:37:d2f4:8ff:fec6:c157' ],
[ 'incus-repo.tier2.se-sto1', 'fd42:4242:2601:2d02:325d:13ff:fe42:2b1f' ],
[ 'deploy.tier2.fr-gra1', 'fd42:4242:2601:3f02:225a:14ff:fe55:f4df' ],
[ 'mesh-reflector.tier2.ca-bhs1', 'fd42:4242:2601:2c02:f22c:89ff:fef5:ef7' ],
@ -25,7 +26,6 @@ var virtual = [
[ 'vault.tier2.de-fra2', 'fd42:4242:2601:2b02:b267:51ff:feed:503f' ],
[ 'acme.tier2.uk-lon1', 'fd42:4242:2601:3502:4285:15ff:feee:d66c' ],
[ 'dns-primary.tier2.de-fra2', 'fd42:4242:2601:2b02:12b0:ff:fe69:edbe' ],
[ 'factorio.nl-ams3', 'fd42:4242:2601:3c:216:3eff:fe98:b1f5' ],
[ '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' ],
@ -36,7 +36,6 @@ var virtual = [
[ 'dns-dns64.no-trd1', 'fd42:4242:2601:39:42ef:47ff:feb6:6c44' ],
[ 'dns-dns64.uk-lon1', 'fd42:4242:2601:35:42ef:47ff:feb6:6c44' ],
[ 'dns-edge.uk-lon1', 'fd42:4242:2601:35:d2f4:8ff:fec6:c157' ],
[ 'dns-edge.ch-zur2', 'fd42:4242:2601:27:d2f4:8ff:fec6:c157' ],
[ 'dns-secondary.us-lax1', 'fd42:4242:2601:2a:9293:33ff:fe69:c7f2' ],
[ 'dns-secondary.us-nyc1', 'fd42:4242:2601:29:9293:33ff:fe69:c7f2' ],
[ 'dns-dns64.us-lax1', 'fd42:4242:2601:2a:42ef:47ff:feb6:6c44' ],
@ -51,10 +50,6 @@ var virtual = [
[ 'repo.tier2.de-fra2', 'fd42:4242:2601:2b02:216:3eff:febd:fc93' ],
[ 'dns-dns64.de-fra2', 'fd42:4242:2601:2b:42ef:47ff:feb6:6c44' ],
[ 'dns-secondary.tier2.de-fra2', 'fd42:4242:2601:2b02:9293:33ff:fe69:c7f2' ],
[ 'containerd.tier2.de-nue1', 'fd42:4242:2601:3702:9279:c8ff:fe7d:dbdd' ],
[ 'dns-edge.de-nue1', 'fd42:4242:2601:37:d2f4:8ff:fec6:c157' ],
[ '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-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' ],
@ -74,12 +69,10 @@ var virtual = [
[ 'containerd.tier2.us-nyc2', 'fd42:4242:2601:3d02:9279:c8ff:fe7d:dbdd' ],
[ 'containerd.tier2.us-nyc1', 'fd42:4242:2601:2902:9279:c8ff:fe7d:dbdd' ],
[ 'containerd.tier2.us-lax1', 'fd42:4242:2601:2a02:9279:c8ff:fe7d:dbdd' ],
[ 'containerd.tier2.fr-par3', 'fd42:4242:2601:2602:9279:c8ff:fe7d:dbdd' ],
[ 'containerd.tier2.nl-ams1', 'fd42:4242:2601:3202:9279:c8ff:fe7d:dbdd' ],
[ 'containerd.tier2.uk-lon3', 'fd42:4242:2601:3002:9279:c8ff:fe7d:dbdd' ],
[ 'containerd.tier2.uk-lon1', 'fd42:4242:2601:3502:9279:c8ff:fe7d:dbdd' ],
[ 'containerd.tier2.fr-par1', 'fd42:4242:2601:3602:9279:c8ff:fe7d:dbdd' ],
[ 'containerd.tier2.ch-zur2', 'fd42:4242:2601:2702:9279:c8ff:fe7d:dbdd' ],
[ 'containerd.tier2.ch-zur1', 'fd42:4242:2601:2802:9279:c8ff:fe7d:dbdd' ],
[ 'containerd.tier2.de-fra2', 'fd42:4242:2601:2b02:9279:c8ff:fe7d:dbdd' ],
[ 'containerd.tier2.de-fra1', 'fd42:4242:2601:3102:9279:c8ff:fe7d:dbdd' ],
@ -87,18 +80,7 @@ var virtual = [
[ 'nomad.tier2.de-fra1', 'fd42:4242:2601:3102:12cd:cfff:fece:ba47' ],
[ 'ldap-slave.us-nyc2', 'fd42:4242:2601:3d:7222:61ff:fec9:5bd0' ],
[ 'dns-edge.nl-ams1', 'fd42:4242:2601:32:d2f4:8ff:fec6:c157' ],
[ 'nats.us-nyc1', 'fd42:4242:2601:29:e2b8:99ff:febf:5a84' ],
[ 'nats.de-fra1', 'fd42:4242:2601:31:e2b8:99ff:febf:5a84' ],
[ 'nats.us-lax1', 'fd42:4242:2601:2a:e2b8:99ff:febf:5a84' ],
[ 'nats.fr-par1', 'fd42:4242:2601:36:e2b8:99ff:febf:5a84' ],
[ 'nats.fr-par3', 'fd42:4242:2601:26:e2b8:99ff:febf:5a84' ],
[ 'collector.fr-par1', 'fd42:4242:2601:36:62e4:b9ff:fe9a:33d1' ],
[ 'nats.uk-lon1', 'fd42:4242:2601:35:e2b8:99ff:febf:5a84' ],
[ 'nats.uk-lon4', 'fd42:4242:2601:25:e2b8:99ff:febf:5a84' ],
[ 'nats.ch-zur2', 'fd42:4242:2601:27:e2b8:99ff:febf:5a84' ],
[ 'vault.tier2.ch-zur2', 'fd42:4242:2601:2702:b267:51ff:feed:503f' ],
[ 'dns-burble.tier2.ch-zur2', 'fd42:4242:2601:2702:d2d7:2cff:fe85:3bcc' ],
[ 'dns-trace.tier2.ch-zur2', 'fd42:4242:2601:2702:216:3eff:fe4b:4dbf' ],
[ 'certman.tier2.de-fra2', 'fd42:4242:2601:2b02:5274:9eff:fe81:4c8a' ],
[ 'wdev.tier2.uk-lon3', 'fd42:4242:2601:3002:216:3eff:fed3:dda4' ],
[ 'borg.tier2.fr-par1', 'fd42:4242:2601:3602:216:3eff:fefb:2143' ],
@ -111,8 +93,6 @@ var virtual = [
[ 'registry.tier2.uk-lon3', 'fd42:4242:2601:3002:216:3eff:febc:57b5' ],
[ 'registry.tier2.nl-ams1', 'fd42:4242:2601:3202:216:3eff:fe40:b5f1' ],
[ 'dns-edge.uk-lon3', 'fd42:4242:2601:30:d2f4:8ff:fec6:c157' ],
[ 'borg.tier2.fr-par3', 'fd42:4242:2601:2602:216:3eff:fef1:4f77' ],
[ 'dns-edge.fr-par3', 'fd42:4242:2601:26:d2f4:8ff:fec6:c157' ],
[ 'dialup.tier2.fr-par1', 'fd42:4242:2601:3602:216:3eff:fe0b:d2b1' ],
[ 'voip-svcs.fr-par1', 'fd42:4242:2601:36:216:3eff:fe1b:9ad5' ],
[ 'ldap-master.tier2.de-fra1', 'fd42:4242:2601:3102:2203:43ff:feae:28bb' ],