tidy fr-rbx1 and add shell.burble.dn42
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Simon Marsh 2023-02-05 11:13:48 +00:00
parent dcdec416e7
commit f6761398d5
Signed by: burble
GPG Key ID: E9B4156C1659C079
2 changed files with 3 additions and 30 deletions

View File

@ -24,14 +24,12 @@ service('pingable', 'fd42:4242:2601:ac05::1', '172.20.129.5');
// 172.20.129.6 was wiki but not now used
service('rproxy', 'fd42:4242:2601:acf0::1', '172.20.129.7');
service('whois', 'fd42:4242:2601:ac43::1', '172.20.129.8');
// services 172.20.129.9 -> 172.20.129.29 are unassigned
service('asterisk.fr-par1', 'fd42:4242:2601:37:216:3eff:fe8f:6211', '172.20.129.9');
service('shell', 'fd42:4242:2601:ac22::1', '172.20.129.10');
// services 172.20.129.10 -> 172.20.129.29 are unassigned
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.fr-nte2', 'fd42:4242:2601:1004:fc13:b592:53b0:8ff4', '172.20.129.29');
service('shell.ca-bhs2', 'fd42:4242:2601:100d:216:3eff:fed7:2ceb', '172.20.129.30');
//service('shell.fr-rbx1', 'fd42:4242:2601:1016:216:3eff:feae:51a8', '172.20.129.31');
service('asterisk.fr-par1', 'fd42:4242:2601:37:216:3eff:fe8f:6211', '172.20.129.9');
D_EXTEND(
@ -87,9 +85,6 @@ D_EXTEND(
CNAME('nc-master', 'docker.tier2.fr-par1.burble.dn42.')
);
// bgptools dmz container
service('bgptools.fr-rbx1', 'fd42:4242:2601:1016:216:3eff:fe6b:a0cd');
// other service cnames
D_EXTEND(
domain,
@ -119,8 +114,6 @@ D_EXTEND(
SSHFP('grc', 4, 2, 'c3a2470309cb1e6fba252231a6504a096ffd8b6f92442493f762e7512c515e76'),
// shell servers SSHFP
//SSHFP('shell.fr-rbx1', 4, 1, '9bc4c0a9ca5fddcab1d1f5ee26887e954411b587'),
//SSHFP('shell.fr-rbx1', 4, 2, 'fb2ddf25f4a228e147134b2a02187d4710aa78929cdbe2a119a183e91a758a81'),
SSHFP('shell.ca-bhs2', 4, 1, '3e08e7e4f261211d23ea92a4dd4fa210c1cedfd9'),
SSHFP('shell.ca-bhs2', 4, 2, 'aeace90bd0ecb5cd10243ce96660437ed179276a94ab654f3fd927154ef21e01'),
SSHFP('shell.fr-nte2', 4, 1, 'edbc49824a13e4ed3ff5de622860fe58de26ddb1'),
@ -135,7 +128,6 @@ D_EXTEND(
MX('mail-dn42dev', 10, 'mail-dn42dev.tier2.ca-bhs2.burble.dn42.'),
// speedtest
//CNAME('speedtest.fr-rbx1', 'nginx.fr-rbx1.burble.dn42.'),
CNAME('speedtest.fr-par1', 'nginx.fr-par1.burble.dn42.'),
CNAME('speedtest.ca-bhs2', 'nginx.ca-bhs2.burble.dn42.'),
CNAME('speedtest.us-lax1', 'nginx.us-lax1.burble.dn42.'),
@ -165,7 +157,6 @@ D_EXTEND(
// dmz special config
AAAA('dmz.uk-lon1', '2a04:92c5:2:1::1'),
AAAA('dmz.de-fra1', '2a0d:5941:1:17c::4e2a'),
//AAAA('dmz.fr-rbx1', '2001:41d0:8:6a47::1'),
AAAA('dmz.ca-bhs2', '2607:5300:120:81a::1')
);

View File

@ -51,7 +51,6 @@ var virtual = [
[ 'peerfinder.de-fra1', 'fd42:4242:2601:31:7283:bfff:fe29:d7e4' ],
[ 'peerfinder.ca-bhs2', 'fd42:4242:2601:2d:7283:bfff:fe29:d7e4' ],
[ 'peerfinder.fr-par1', 'fd42:4242:2601:36:7283:bfff:fe29:d7e4' ],
//[ 'peerfinder.fr-rbx1', 'fd42:4242:2601:32:7283:bfff:fe29:d7e4' ],
[ 'peerfinder.uk-lon1', 'fd42:4242:2601:35:7283:bfff:fe29:d7e4' ],
[ 'dns-edge.us-lax1', 'fd42:4242:2601:2a:d2f4:8ff:fec6:c157' ],
[ 'dns-edge.fr-par1', 'fd42:4242:2601:36:d2f4:8ff:fec6:c157' ],
@ -59,57 +58,42 @@ var virtual = [
[ 'docker.tier2.ch-zur1', 'fd42:4242:2601:2802:926f:e2ff:fe66:b75e' ],
[ 'docker.tier2.ca-bhs2', 'fd42:4242:2601:2d02:926f:e2ff:fe66:b75e' ],
[ 'docker.tier2.de-fra1', 'fd42:4242:2601:3102:926f:e2ff:fe66:b75e' ],
//[ 'docker.tier2.fr-rbx1', 'fd42:4242:2601:3202:926f:e2ff:fe66:b75e' ],
[ 'docker.tier1.fr-par1', 'fd42:4242:2601:36:216:3eff:fe29:1c01' ],
[ 'docker.tier1.ca-bhs2', 'fd42:4242:2601:2d:216:3eff:fe29:1c01' ],
[ 'docker.tier1.de-fra1', 'fd42:4242:2601:31:216:3eff:fe29:1c01' ],
//[ 'docker.tier1.fr-rbx1', 'fd42:4242:2601:32:216:3eff:fe29:1c01' ],
[ 'dns-edge.de-fra2', 'fd42:4242:2601:2c:d2f4:8ff:fec6:c157' ],
[ 'grafana.tier2.de-fra1', 'fd42:4242:2601:3102:52c3:baff:fee0:9def' ],
[ 'pingotron.tier1.de-fra1', 'fd42:4242:2601:31:721d:15ff:feb3:cab6' ],
[ 'jcr.tier2.de-fra1', 'fd42:4242:2601:3102:e2f2:3cff:fe4e:eb71' ],
[ 'lounge.tier2.de-fra1', 'fd42:4242:2601:3102:6242:b7ff:feb9:161c' ],
[ 'dn42svcsd.tier2.de-fra1', 'fd42:4242:2601:3102:52bd:35ff:feb6:b93e' ],
//[ 'nginx.fr-rbx1', 'fd42:4242:2601:32:225f:faff:fe4e:f64c' ],
[ 'monitor.tier2.ca-bhs2', 'fd42:4242:2601:2d02:226:95ff:fe88:5812' ],
[ 'dns-master.ca-bhs2', 'fd42:4242:2601:2d:2234:1aff:feed:6755' ],
//[ 'cfprox.tier2.fr-rbx1', 'fd42:4242:2601:3202:c250:85ff:fea4:47fe' ],
[ 'cfprox.tier2.de-fra1', 'fd42:4242:2601:3102:c250:85ff:fea4:47fe' ],
[ 'ldap-slave.ca-bhs2', 'fd42:4242:2601:2d:7222:61ff:fec9:5bd0' ],
//[ 'ldap-slave.fr-rbx1', 'fd42:4242:2601:32:7222:61ff:fec9:5bd0' ],
[ 'vrenew.tier2.de-fra1', 'fd42:4242:2601:3102:f204:e6ff:fe33:89ee' ],
//[ 'collector.fr-rbx1', 'fd42:4242:2601:32:62e4:b9ff:fe9a:33d1' ],
[ 'rsync.tier2.ca-bhs2', 'fd42:4242:2601:2d02:d2df:d7ff:fe86:283c' ],
//[ 'rsync.tier2.fr-rbx1', 'fd42:4242:2601:3202:d2df:d7ff:fe86:283c' ],
[ 'whois42d.ca-bhs2', 'fd42:4242:2601:2d:6ef1:85ff:fe3b:8aba' ],
[ 'whois42d.de-fra1', 'fd42:4242:2601:31:6ef1:85ff:fe3b:8aba' ],
[ 'nginx.de-fra1', 'fd42:4242:2601:31:225f:faff:fe4e:f64c' ],
[ 'nginx.ca-bhs2', 'fd42:4242:2601:2d:225f:faff:fe4e:f64c' ],
//[ 'n8n.tier2.fr-rbx1', 'fd42:4242:2601:3202:8248:6eff:fe16:811e' ],
[ 'vrenew.tier2.ca-bhs2', 'fd42:4242:2601:2d02:f204:e6ff:fe33:89ee' ],
[ 'dns-slave.tier2.ca-bhs2', 'fd42:4242:2601:2d02:a25e:b7ff:feea:64ed' ],
[ 'wiki.tier2.ca-bhs2', 'fd42:4242:2601:2d02:d295:9aff:fe31:914f' ],
[ 'mysql.tier2.ca-bhs2', 'fd42:4242:2601:2d02:6291:1fff:fe63:f812' ],
[ 'monitor.tier2.de-fra1', 'fd42:4242:2601:3102:226:95ff:fe88:5812' ],
//[ 'drone-server.tier2.fr-rbx1', 'fd42:4242:2601:3202:42e6:9ff:fe09:bfc0' ],
//[ 'drone-exec.tier2.fr-rbx1', 'fd42:4242:2601:3202:423b:9dff:fec1:7388' ],
[ 'repo.tier2.fr-par2', 'fd42:4242:2601:3802:216:3eff:fe0d:9a9d' ],
//[ 'abuild.tier2.fr-rbx1', 'fd42:4242:2601:3202:216:3eff:fec5:ecd9' ],
//[ 'builder.tier2.fr-rbx1', 'fd42:4242:2601:3202:216:3eff:fe40:3a63' ],
//[ 'vrenew.tier2.fr-rbx1', 'fd42:4242:2601:3202:f204:e6ff:fe33:89ee' ],
[ 'monitor.tier2.ch-zur1', 'fd42:4242:2601:2802:226:95ff:fe88:5812' ],
[ 'dns-edge.ca-bhs2', 'fd42:4242:2601:2d:d2f4:8ff:fec6:c157' ],
[ 'dns-edge.ch-zur1', 'fd42:4242:2601:28:d2f4:8ff:fec6:c157' ],
[ 'dns-edge.de-fra1', 'fd42:4242:2601:31:d2f4:8ff:fec6:c157' ],
[ 'dns-edge.us-phx1', 'fd42:4242:2601:2b:d2f4:8ff:fec6:c157' ],
[ 'dns-edge.no-trd1', 'fd42:4242:2601:39:d2f4:8ff:fec6:c157' ],
//[ 'dns-edge.fr-rbx1', 'fd42:4242:2601:32:d2f4:8ff:fec6:c157' ],
[ 'php-apps.tier2.de-fra1', 'fd42:4242:2601:3102:72f0:dfff:fe5a:9569' ],
[ 'acme.tier2.de-fra1', 'fd42:4242:2601:3102:1c41:aeff:fec2:8c12' ],
[ 'git.de-fra1', 'fd42:4242:2601:31:3246:4eff:fe04:fd8b' ],
[ 'mail-dn42dev.tier2.ca-bhs2', 'fd42:4242:2601:2d02:820c:f8ff:fe15:3ce0' ],
[ 'mail-dn42dev.tier2.de-fra1', 'fd42:4242:2601:3102:820c:f8ff:fe15:3ce0' ],
//[ 'monitor.tier2.fr-rbx1', 'fd42:4242:2601:3202:c565:30ec:48a0:067d' ],
[ 'wiki.tier2.de-fra1', 'fd42:4242:2601:3102:d295:9aff:fe31:914f' ],
[ 'rsync.tier2.de-fra1', 'fd42:4242:2601:3102:d2df:d7ff:fe86:283c' ],
[ 'glass.tier2.de-fra1', 'fd42:4242:2601:3102:82a9:33ff:fec3:d33d' ],
@ -118,8 +102,6 @@ var virtual = [
[ 'gortr.ca-bhs2', 'fd42:4242:2601:2d:1abb:1cc2:5442:5172' ],
[ 'gortr.de-fra1', 'fd42:4242:2601:31:156c:c76c:9e76:f8ff' ],
[ 'vault.tier2.de-fra1', 'fd42:4242:2601:3102:b267:51ff:feed:503f' ],
//[ 'mysql.tier2.fr-rbx1', 'fd42:4242:2601:3202:6e22:e022:b25d:574a' ],
//[ 'vault.tier2.fr-rbx1', 'fd42:4242:2601:3202:b267:51ff:feed:503f' ],
[ 'dns-edge.uk-lon1', 'fd42:4242:2601:35:d2f4:8ff:fec6:c157' ],
[ 'borg.tier2.fr-par2', 'fd42:4242:2601:3802:216:3eff:fe45:9a99' ],
];