update shell
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Simon Marsh 2021-06-20 13:09:16 +01:00
parent 8af868ec5c
commit 38bb3c12b1
Signed by: burble
GPG Key ID: 0FCCD13AE1CF7ED8
3 changed files with 25 additions and 23 deletions

View File

@ -11,16 +11,16 @@ D_EXTEND(
domain,
// MX records
MX('@', 1, 'aspmx.l.google.com.'),
MX('@', 5, 'alt2.aspmx.l.google.com.'),
MX('@', 5, 'alt1.aspmx.l.google.com.'),
MX('@', 1, 'aspmx.l.google.com.'),
MX('@', 5, 'alt2.aspmx.l.google.com.'),
MX('@', 5, 'alt1.aspmx.l.google.com.'),
MX('@', 10, 'aspmx3.googlemail.com.'),
MX('@', 10, 'aspmx2.googlemail.com.'),
MX('@', 10, 'aspmx2.googlemail.com.'),
// SPF and DMARC
TXT('@', 'v=spf1 include:_spf.google.com ~all'),
TXT('_dmarc', 'v=DMARC1; p=reject'),
TXT('google._domainkey', 'v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCClWMiLTcb8z420zEocWjRmlGwOH/Edpfk1e2T5S4rE12BeGt2dFk3YA4edeiNlc9E2sJSMepKeGx5mI3jOGfM7LPiL56bCPTvNH6JrHDZCvQuWysHxuXemigPo88DHwOT3N+LAlFdaQSP4ByaBomAPDh6hVEJQfhXS1cMH4RkeQIDAQAB'),
TXT('@', 'v=spf1 include:_spf.google.com ~all'),
TXT('_dmarc', 'v=DMARC1; p=reject'),
TXT('google._domainkey', 'v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCClWMiLTcb8z420zEocWjRmlGwOH/Edpfk1e2T5S4rE12BeGt2dFk3YA4edeiNlc9E2sJSMepKeGx5mI3jOGfM7LPiL56bCPTvNH6JrHDZCvQuWysHxuXemigPo88DHwOT3N+LAlFdaQSP4ByaBomAPDh6hVEJQfhXS1cMH4RkeQIDAQAB'),
// keybase verification
TXT('@', 'keybase-site-verification=ONX4nkgR0mO-sRKbQ9druzvm1PC_iAvMq-1P3pCGFA8')
@ -35,26 +35,26 @@ D_EXTEND(
// websites
ALIAS('@', 'uk-lon1.burble.com.', CF_PROXY_ON),
CNAME('www', 'uk-lon1.burble.com.', CF_PROXY_ON),
CNAME('dn42','de-fra1.burble.com.', CF_PROXY_ON),
CNAME('www', 'uk-lon1.burble.com.', CF_PROXY_ON),
CNAME('dn42','de-fra1.burble.com.', CF_PROXY_ON),
// status from uptime robot
CNAME('dn42.status', 'stats.uptimerobot.com.'),
CNAME('dn42.status', 'stats.uptimerobot.com.'),
// DN42 services
CNAME('explorer', 'de-fra1.burble.com.', CF_PROXY_ON),
CNAME('lg', 'de-fra1.burble.com.', CF_PROXY_ON),
CNAME('collector', 'fr-rbx1.burble.com.', CF_PROXY_ON),
CNAME('grc', 'fr-rbx1.burble.com.', CF_PROXY_ON),
CNAME('lg-grc', 'fr-rbx1.burble.com.', CF_PROXY_ON),
CNAME('git', 'de-fra1.burble.com.', CF_PROXY_ON),
CNAME('paste', 'de-fra1.burble.com.', CF_PROXY_ON),
CNAME('wiki', 'de-fra1.burble.com.', CF_PROXY_ON),
CNAME('explorer', 'de-fra1.burble.com.', CF_PROXY_ON),
CNAME('lg', 'de-fra1.burble.com.', CF_PROXY_ON),
CNAME('collector', 'fr-rbx1.burble.com.', CF_PROXY_ON),
CNAME('grc', 'fr-rbx1.burble.com.', CF_PROXY_ON),
CNAME('lg-grc', 'fr-rbx1.burble.com.', CF_PROXY_ON),
CNAME('git', 'de-fra1.burble.com.', CF_PROXY_ON),
CNAME('paste', 'de-fra1.burble.com.', CF_PROXY_ON),
CNAME('wiki', 'de-fra1.burble.com.', CF_PROXY_ON),
CNAME('lounge', 'uk-lon1.burble.com.', CF_PROXY_ON),
CNAME('next', 'uk-lon3.burble.com.', CF_PROXY_ON),
CNAME('grafana', 'de-fra1.burble.com.', CF_PROXY_ON)
CNAME('grafana', 'de-fra1.burble.com.', CF_PROXY_ON)
);
@ -66,7 +66,9 @@ D_EXTEND(
D_EXTEND(
domain,
A('uk-bri1', '5.65.212.88')
A('shell.fr-rbx1', '178.33.134.8'),
AAAA('shell.fr-rbx1', '2001:41d0:8:127:216:3eff:feae:51a8'),
A('uk-bri1', '176.25.208.180')
);

View File

@ -24,7 +24,8 @@ 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.31 are unassigned
// services 172.20.129.9 -> 172.20.129.30 are unassigned
service('shell.fr-rbx1', 'fd42:4242:2601:1016:216:3eff:feae:51a8', '172.20.129.31');
// internal anycasts
service('rpki', 'fd42:4242:2601:ac10::1');

View File

@ -1,6 +1,5 @@
var virtual = [
// insert here
[ 'shell.fr-rbx1', 'fd42:4242:2601:1016:216:3eff:fe22:68c' ],
[ 'ldap-admin.tier2.uk-lon1', 'fd42:4242:2601:3502:216:3eff:fe77:b8a8' ],
[ 'mkdevg.tier2.uk-lon1', 'fd42:4242:2601:3502:216:3eff:fee0:2e6c' ],
[ 'gdev.tier2.uk-lon1', 'fd42:4242:2601:3502:216:3eff:feee:aab0' ],