diff --git a/domains/030-burble.dn42.js b/domains/030-burble.dn42.js index 4ec200b..e053db0 100644 --- a/domains/030-burble.dn42.js +++ b/domains/030-burble.dn42.js @@ -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('new-nats', 'fd42:4242:2601:ac06::1', '172.20.129.6'); +service('nats', 'fd42:4242:2601:ac06::1', '172.20.129.6'); service('rproxy', 'fd42:4242:2601:acf0::1', '172.20.129.7'); 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'); @@ -42,7 +42,6 @@ service('vault.service', 'fd42:4242:2601:acf0::20:1'); service('acme', 'fd42:4242:2601:acf0::30:1'); service('etcd', 'fd42:4242:2601:acf0::50:1'); service('ldap', 'fd42:4242:2601:acf0::60:1'); -service('old-nats', 'fd42:4242:2601:acf0::70:1'); // proxied services proxied('explorer'); @@ -86,7 +85,7 @@ D_EXTEND( domain, // temporary - CNAME('nats', 'old-nats.burble.dn42.'), + CNAME('new-nats', 'nats.burble.dn42.'), // evpn subdomain NS('evpn', 'ns.de-fra1.evpn.burble.dn42.'), diff --git a/dynamic/nodes.js b/dynamic/nodes.js index cb3d2f4..4090d23 100644 --- a/dynamic/nodes.js +++ b/dynamic/nodes.js @@ -4,7 +4,6 @@ var nodes = [ [ 'ch-zur1', '45.91.92.111', '2a0e:dc0:6:8::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' ], - [ 'us-lax2', '45.8.22.108', '2602:fcd3:1b1:170::1', 'true', 11, '172.20.129.171' ], [ 'ca-bhs2', '192.99.6.65', '2607:5300:60:3741::1', 'true', 13, '172.20.129.167' ], [ 'uk-lon2', '150.107.201.114', '2a0e:dc0:5:dc62::1', 'true', 14, '172.20.129.166' ], [ 'uk-lon3', '150.107.201.105', '2a0e:dc0:5:d2dd::1', 'true', 16, '172.20.129.184' ], diff --git a/dynamic/virtual.js b/dynamic/virtual.js index 6648e8b..bb98956 100644 --- a/dynamic/virtual.js +++ b/dynamic/virtual.js @@ -22,14 +22,12 @@ var virtual = [ [ 'git.tier2.uk-lon3', 'fd42:4242:2601:3002:216:3eff:fe71:dd0e' ], [ 'borg.tier2.fr-par1', 'fd42:4242:2601:3602:216:3eff:fefb:2143' ], [ 'borg.tier2.uk-lon2', 'fd42:4242:2601:2e02:216:3eff:fef0:fb9e' ], - [ 'nats.tier2.uk-lon1', 'fd42:4242:2601:3502:e2b8:99ff:febf:5a84' ], [ 'gortr.us-nyc1', 'fd42:4242:2601:29:824f:ecff:fe48:36fc' ], [ 'whois42d.us-nyc1', 'fd42:4242:2601:29:6ef1:85ff:fe3b:8aba' ], [ 'nginx.us-nyc1', 'fd42:4242:2601:29:225f:faff:fe4e:f64c' ], [ 'dn42regsrv.tier2.us-nyc1', 'fd42:4242:2601:2902:d227:83ff:fe59:c446' ], [ 'rsync.tier2.us-nyc1', 'fd42:4242:2601:2902:d2df:d7ff:fe86:283c' ], [ 'peerfinder.us-nyc1', 'fd42:4242:2601:29:7283:bfff:fe29:d7e4' ], - [ 'nats.tier2.us-nyc1', 'fd42:4242:2601:2902:e2b8:99ff:febf:5a84' ], [ 'dns-edge.us-nyc1', 'fd42:4242:2601:29:d2f4:8ff:fec6:c157' ], [ 'deploy.tier2.uk-lon3', 'fd42:4242:2601:3002:216:3eff:feb2:4a6b' ], [ 'shell.tier2.uk-lon3', 'fd42:4242:2601:3002:216:3eff:fe08:6d2a' ], @@ -48,7 +46,6 @@ var virtual = [ [ 'docker.tier2.fr-par2', 'fd42:4242:2601:3802:926f:e2ff:fe66:b75e' ], [ 'vault.tier2.fr-par2', 'fd42:4242:2601:3802:b267:51ff:feed:503f' ], [ 'mysql.tier2.fr-par2', 'fd42:4242:2601:3802:6291:1fff:fe63:f812' ], - [ 'nats.tier2.fr-par2', 'fd42:4242:2601:3802:e2b8:99ff:febf:5a84' ], [ 'deploy.tier2.fr-par2', 'fd42:4242:2601:3802:216:3eff:fe34:2e2b' ], [ 'shell.tier2.fr-par2', 'fd42:4242:2601:3802:216:3eff:fe57:5e4b' ], [ 'registry.tier2.fr-par2', 'fd42:4242:2601:3802:216:3eff:fedb:8011' ], @@ -56,11 +53,7 @@ var virtual = [ [ 'dns-slave.tier2.us-lax1', 'fd42:4242:2601:2a02:a25e:b7ff:feea:64ed' ], [ 'mysql.tier2.us-lax1', 'fd42:4242:2601:2a02:6291:1fff:fe63:f812' ], [ 'mysql.tier2.fr-par1', 'fd42:4242:2601:3602:6291:1fff:fe63:f812' ], - [ 'nats.tier2.us-lax1', 'fd42:4242:2601:2a02:e2b8:99ff:febf:5a84' ], - [ 'nats.tier2.ca-bhs2', 'fd42:4242:2601:2d02:e2b8:99ff:febf:5a84' ], [ 'nginx.fr-par1', 'fd42:4242:2601:36:225f:faff:fe4e:f64c' ], - [ 'nats.tier2.de-fra1', 'fd42:4242:2601:3102:e2b8:99ff:febf:5a84' ], - [ 'nats.tier2.fr-par1', 'fd42:4242:2601:3602:e2b8:99ff:febf:5a84' ], [ 'vault.tier2.fr-par1', 'fd42:4242:2601:3602:b267:51ff:feed:503f' ], [ 'docker.tier2.fr-par1', 'fd42:4242:2601:3602:926f:e2ff:fe66:b75e' ], [ 'ldap-slave.fr-par1', 'fd42:4242:2601:36:7222:61ff:fec9:5bd0' ],