add docker-hub and tidy up
Some checks failed
continuous-integration/drone/push Build is failing

This commit is contained in:
Simon Marsh 2022-02-20 14:30:39 +00:00
parent 3ccded3b35
commit 5e63c1536b
Signed by: burble
GPG Key ID: 0FCCD13AE1CF7ED8

View File

@ -100,15 +100,9 @@ D_EXTEND(
CNAME('speedtest.fr-rbx1', 'nginx.fr-rbx1.burble.dn42.'),
CNAME('speedtest.ca-bhs2', 'nginx.ca-bhs2.burble.dn42.'),
// etcd service discovery
SRV('_etcd-server-ssl._tcp', 0, 0, 2380, 'etcd.tier2.fr-rbx1.burble.dn42.'),
SRV('_etcd-server-ssl._tcp', 0, 0, 2380, 'etcd.tier2.uk-lon1.burble.dn42.'),
SRV('_etcd-server-ssl._tcp', 0, 0, 2380, 'etcd.tier2.ca-bhs2.burble.dn42.'),
SRV('_etcd-server-ssl._tcp', 0, 0, 2380, 'etcd.tier2.de-fra1.burble.dn42.'),
SRV('_etcd-server-ssl._tcp', 0, 0, 2380, 'etcd.tier2.us-dal3.burble.dn42.'),
// fr-rbx1 traefik
CNAME('docker-hub.tier2.fr-rbx1', 'docker-vm.tier2.fr-rbx1.burble.dn42')
SRV('_etcd-client-ssl._tcp', 0, 0, 2379, 'etcd.burble.dn42.')
);
//////////////////////////////////////////////////////////////////////////
@ -124,16 +118,6 @@ D_EXTEND(
AAAA('dmz.ca-bhs2', '2607:5300:120:81a::1')
);
// homenet special config
D_EXTEND(
domain,
A( 'vega.mesh.uk-bri1', '172.20.129.191'),
AAAA('vega.mesh.uk-bri1', 'fd42:4242:2601:2001:216:3eff:fed4:fb70'),
A( 'alathfar.mesh.uk-bri1', '172.20.129.190'),
AAAA('alathfar.mesh.uk-bri1', 'fd42:4242:2601:2001:216:3eff:fee8:709d')
);
// main nodes