From a4382a3d7af0e908f2ee5c35f46a8b27781f9a91 Mon Sep 17 00:00:00 2001 From: Bastian Date: Wed, 17 Jan 2018 21:02:38 +0100 Subject: [PATCH] Domain Config compacted, ports correted --- domains/ffrgb_cty.conf | 42 ++++++++++++++++++------------------------ domains/ffrgb_tst.conf | 42 ++++++++++++++++++------------------------ domains/ffrgb_uml.conf | 42 ++++++++++++++++++------------------------ 3 files changed, 54 insertions(+), 72 deletions(-) diff --git a/domains/ffrgb_cty.conf b/domains/ffrgb_cty.conf index b85c1b1..7e57435 100644 --- a/domains/ffrgb_cty.conf +++ b/domains/ffrgb_cty.conf @@ -60,35 +60,29 @@ gwpri = { --[[ primary ]] key = '86a4dcdbaba87fe30da03cc398a083d7a0725c44dac733b583515b188fdc63dd', remotes = { - 'ipv6 "gw11.ffrgb.net" port 10010', - 'ipv6 "gw11.ffrgb.net" port 10011', - 'ipv6 "gw11.ffrgb.net" port 10012', - 'ipv4 "gw11.ffrgb.net" port 10010', - 'ipv4 "gw11.ffrgb.net" port 10011', - 'ipv4 "gw11.ffrgb.net" port 10012', - 'ipv6 "gw11.regensburg.freifunk.net" port 10010', - 'ipv6 "gw11.regensburg.freifunk.net" port 10011', - 'ipv6 "gw11.regensburg.freifunk.net" port 10012', - 'ipv4 "gw11.regensburg.freifunk.net" port 10010', - 'ipv4 "gw11.regensburg.freifunk.net" port 10011', - 'ipv4 "gw11.regensburg.freifunk.net" port 10012', + '"gw11.ffrgb.net" port 10010', + '"gw11.ffrgb.net" port 10011', + '"gw11.ffrgb.net" port 10012', + '"gw11.regensburg.freifunk.net" port 10010', + '"gw11.regensburg.freifunk.net" port 10011', + '"gw11.regensburg.freifunk.net" port 10012', + 'ipv6 "2a00:9d80:8000:2007::131" port 10010', + 'ipv6 "2a00:9d80:8000:2007::131" port 10011', + 'ipv6 "2a00:9d80:8000:2007::131" port 10012', + 'ipv4 "185.53.218.131" port 10010', + 'ipv4 "185.53.218.131" port 10011', + 'ipv4 "185.53.218.131" port 10012', }, }, gwsec = { --[[ coldstandby ]] key = '0000000000000000000000000000000000000000000000000000000000000000', remotes = { - 'ipv6 "gw12.ffrgb.net" port 10010', - 'ipv6" gw12.ffrgb.net" port 10011', - 'ipv6 "gw12.ffrgb.net" port 10012', - 'ipv4 "gw12.ffrgb.net" port 10010', - 'ipv4 "gw12.ffrgb.net" port 10011', - 'ipv4 "gw12.ffrgb.net" port 10012', - 'ipv6 "gw12.regensburg.freifunk.net" port 10010', - 'ipv6 "gw12.regensburg.freifunk.net" port 10011', - 'ipv6 "gw12.regensburg.freifunk.net" port 10012', - 'ipv4 "gw12.regensburg.freifunk.net" port 10010', - 'ipv4 "gw12.regensburg.freifunk.net" port 10011', - 'ipv4 "gw12.regensburg.freifunk.net" port 10012', + '"gw12.ffrgb.net" port 10010', + '"gw12.ffrgb.net" port 10011', + '"gw12.ffrgb.net" port 10012', + '"gw12.regensburg.freifunk.net" port 10010', + '"gw12.regensburg.freifunk.net" port 10011', + '"gw12.regensburg.freifunk.net" port 10012', }, }, }, diff --git a/domains/ffrgb_tst.conf b/domains/ffrgb_tst.conf index 58feee1..dd65e4e 100644 --- a/domains/ffrgb_tst.conf +++ b/domains/ffrgb_tst.conf @@ -60,35 +60,29 @@ gwpri = { --[[ primary ]] key = '377e0246271bfbf4c99c2d156ee0eb77c16bb5629841fde507cfab6760162b61', remotes = { - 'ipv6 "gw31.ffrgb.net" port 10010', - 'ipv6 "gw31.ffrgb.net" port 10011', - 'ipv6 "gw31.ffrgb.net" port 10012', - 'ipv4 "gw31.ffrgb.net" port 10010', - 'ipv4 "gw31.ffrgb.net" port 10011', - 'ipv4 "gw31.ffrgb.net" port 10012', - 'ipv6 "gw31.regensburg.freifunk.net" port 10010', - 'ipv6 "gw31.regensburg.freifunk.net" port 10011', - 'ipv6 "gw31.regensburg.freifunk.net" port 10012', - 'ipv4 "gw31.regensburg.freifunk.net" port 10010', - 'ipv4 "gw31.regensburg.freifunk.net" port 10011', - 'ipv4 "gw31.regensburg.freifunk.net" port 10012', + '"gw31.ffrgb.net" port 10030', + '"gw31.ffrgb.net" port 10031', + '"gw31.ffrgb.net" port 10032', + '"gw31.regensburg.freifunk.net" port 10030', + '"gw31.regensburg.freifunk.net" port 10031', + '"gw31.regensburg.freifunk.net" port 10032', + 'ipv6 "2a00:9d80:8000:2007::133" port 10030', + 'ipv6 "2a00:9d80:8000:2007::133" port 10031', + 'ipv6 "2a00:9d80:8000:2007::133" port 10032', + 'ipv4 "185.53.218.133" port 10030', + 'ipv4 "185.53.218.133" port 10031', + 'ipv4 "185.53.218.133" port 10032', }, }, gwsec = { --[[ coldstandby ]] key = '0000000000000000000000000000000000000000000000000000000000000000', remotes = { - 'ipv6 "gw32.ffrgb.net" port 10010', - 'ipv6 "gw32.ffrgb.net" port 10011', - 'ipv6 "gw32.ffrgb.net" port 10012', - 'ipv4 "gw32.ffrgb.net" port 10010', - 'ipv4 "gw32.ffrgb.net" port 10011', - 'ipv4 "gw32.ffrgb.net" port 10012', - 'ipv6 "gw32.regensburg.freifunk.net" port 10010', - 'ipv6 "gw32.regensburg.freifunk.net" port 10011', - 'ipv6 "gw32.regensburg.freifunk.net" port 10012', - 'ipv4 "gw32.regensburg.freifunk.net" port 10010', - 'ipv4 "gw32.regensburg.freifunk.net" port 10011', - 'ipv4 "gw32.regensburg.freifunk.net" port 10012', + '"gw32.ffrgb.net" port 10030', + '"gw32.ffrgb.net" port 10031', + '"gw32.ffrgb.net" port 10032', + '"gw32.regensburg.freifunk.net" port 10030', + '"gw32.regensburg.freifunk.net" port 10031', + '"gw32.regensburg.freifunk.net" port 10032', }, }, }, diff --git a/domains/ffrgb_uml.conf b/domains/ffrgb_uml.conf index 65998c6..8fa0d5c 100644 --- a/domains/ffrgb_uml.conf +++ b/domains/ffrgb_uml.conf @@ -60,35 +60,29 @@ gwpri = { --[[ primary ]] key = '0dd861f1725bb5562f96fec8a906440c1965d1b1f8a88663dea834e523d788ea', remotes = { - 'ipv6 "gw21.ffrgb.net" port 10010', - 'ipv6 "gw21.ffrgb.net" port 10011', - 'ipv6 "gw21.ffrgb.net" port 10012', - 'ipv4 "gw21.ffrgb.net" port 10010', - 'ipv4 "gw21.ffrgb.net" port 10011', - 'ipv4 "gw21.ffrgb.net" port 10012', - 'ipv6 "gw21.regensburg.freifunk.net" port 10010', - 'ipv6 "gw21.regensburg.freifunk.net" port 10011', - 'ipv6 "gw21.regensburg.freifunk.net" port 10012', - 'ipv4 "gw21.regensburg.freifunk.net" port 10010', - 'ipv4 "gw21.regensburg.freifunk.net" port 10011', - 'ipv4 "gw21.regensburg.freifunk.net" port 10012', + '"gw21.ffrgb.net" port 10020', + '"gw21.ffrgb.net" port 10021', + '"gw21.ffrgb.net" port 10022', + '"gw21.regensburg.freifunk.net" port 10020', + '"gw21.regensburg.freifunk.net" port 10021', + '"gw21.regensburg.freifunk.net" port 10022', + 'ipv6 "2a00:9d80:8000:2007::132" port 10020', + 'ipv6 "2a00:9d80:8000:2007::132" port 10021', + 'ipv6 "2a00:9d80:8000:2007::132" port 10022', + 'ipv4 "185.53.218.132" port 10020', + 'ipv4 "185.53.218.132" port 10021', + 'ipv4 "185.53.218.132" port 10022', }, }, gwsec = { --[[ coldstandby ]] key = '0000000000000000000000000000000000000000000000000000000000000000', remotes = { - 'ipv6 "gw22.ffrgb.net" port 10010', - 'ipv6 "gw22.ffrgb.net" port 10011', - 'ipv6 "gw22.ffrgb.net" port 10012', - 'ipv4 "gw22.ffrgb.net" port 10010', - 'ipv4 "gw22.ffrgb.net" port 10011', - 'ipv4 "gw22.ffrgb.net" port 10012', - 'ipv6 "gw22.regensburg.freifunk.net" port 10010', - 'ipv6 "gw22.regensburg.freifunk.net" port 10011', - 'ipv6 "gw22.regensburg.freifunk.net" port 10012', - 'ipv4 "gw22.regensburg.freifunk.net" port 10010', - 'ipv4 "gw22.regensburg.freifunk.net" port 10011', - 'ipv4 "gw22.regensburg.freifunk.net" port 10012', + '"gw22.ffrgb.net" port 10020', + '"gw22.ffrgb.net" port 10021', + '"gw22.ffrgb.net" port 10022', + '"gw22.regensburg.freifunk.net" port 10020', + '"gw22.regensburg.freifunk.net" port 10021', + '"gw22.regensburg.freifunk.net" port 10022', }, }, },