From 5e08b9a0ae3b8c567f7760afeca81185d07cc0b2 Mon Sep 17 00:00:00 2001 From: Simon Marsh Date: Sun, 24 Sep 2023 16:20:30 +0100 Subject: [PATCH] more traefik moves --- domains/020-burble.com.js | 6 ++---- domains/040-collector.dn42.js | 13 ++++++------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/domains/020-burble.com.js b/domains/020-burble.com.js index 4d196c4..0be6fb1 100644 --- a/domains/020-burble.com.js +++ b/domains/020-burble.com.js @@ -51,15 +51,13 @@ D_EXTEND( // DN42 services - CNAME('explorer', cf_tun_de_fra1, CF_PROXY_ON), CNAME('lg', cf_tun_de_fra1, CF_PROXY_ON), CNAME('git', cf_tun_de_fra1, CF_PROXY_ON), - CNAME('grafana', cf_tun_de_fra1, CF_PROXY_ON), - - CNAME('uptime', cf_tun_ch_zur1, CF_PROXY_ON), + CNAME('grafana', cf_tun_ch_zur1, CF_PROXY_ON), CNAME('send', cf_tun_fr_par1, CF_PROXY_ON), + CNAME('explorer', cf_tun_uk_lon1, CF_PROXY_ON), CNAME('paste', cf_tun_uk_lon1, CF_PROXY_ON), CNAME('lounge', cf_tun_uk_lon1, CF_PROXY_ON), CNAME('wiki', cf_tun_uk_lon1, CF_PROXY_ON), diff --git a/domains/040-collector.dn42.js b/domains/040-collector.dn42.js index 1be97cd..a212423 100644 --- a/domains/040-collector.dn42.js +++ b/domains/040-collector.dn42.js @@ -5,12 +5,6 @@ domain='collector.dn42'; pdns_domain(domain); ////////////////////////////////////////////////////////////////////////// -// services - -proxied('explorer'); -proxied('lg'); -proxied('mrt'); -proxied('flaps'); // ssh interface service('@', 'fd42:4242:2601:ac12::1', '172.20.129.4'); @@ -22,7 +16,12 @@ D_EXTEND( AAAA('localhost', '::1'), SSHFP('@', 4, 1, 'ff61153c18334e89df3b4b4e4696306eeb5ffe9c'), - SSHFP('@', 4, 2, 'c3a2470309cb1e6fba252231a6504a096ffd8b6f92442493f762e7512c515e76') + SSHFP('@', 4, 2, 'c3a2470309cb1e6fba252231a6504a096ffd8b6f92442493f762e7512c515e76'), + + // collector services + CNAME('explorer', 'traefik.burble.dn42.'), + CNAME('lg', 'traefik-eu.burble.dn42.'), + CNAME('mrt', 'traefik-eu.burble.dn42.') ); //////////////////////////////////////////////////////////////////////////