From 9bf012222ea10d231b948a9056ff0c04186e3dc2 Mon Sep 17 00:00:00 2001 From: Bastian Date: Tue, 16 Jan 2018 19:22:33 +0100 Subject: [PATCH] backported PR's for domain-selct --- Makefile | 4 ++-- domains/ffrgb_cty.conf | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 320900e..92a04e2 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build -GLUON_GIT_URL := https://github.com/kb-light/gluon -GLUON_GIT_REF := c644d5276c8183799b852b51c818c45f740b21e0 +GLUON_GIT_URL := https://github.com/ffrgb/gluon +GLUON_GIT_REF := 114bbd4f0bf6b96032e92bcefa8a0a02c0c7f553 #https://github.com/freifunk-gluon/gluon/commit/6b8888fe5aebd941c5e7a83a97ceb0678bee4c43 diff --git a/domains/ffrgb_cty.conf b/domains/ffrgb_cty.conf index b4cd258..2280cb8 100644 --- a/domains/ffrgb_cty.conf +++ b/domains/ffrgb_cty.conf @@ -71,16 +71,22 @@ key = '86a4dcdbaba87fe30da03cc398a083d7a0725c44dac733b583515b188fdc63dd', remotes = { 'ipv4 "gw11.ffrgb.net" port 10010', + 'ipv4 "gw11.regensburg.freifunk.net" port 10010', 'ipv4 "gw11.ffrgb.net" port 10011', + 'ipv4 "gw11.regensburg.freifunk.net" port 10011', 'ipv4 "gw11.ffrgb.net" port 10012', + 'ipv4 "gw11.regensburg.freifunk.net" port 10012', }, }, gwsec = { --[[ coldstandby ]] key = '', remotes = { 'ipv4 "gw12.ffrgb.net" port 10010', + 'ipv4 "gw12.regensburg.freifunk.net" port 10010', 'ipv4 "gw12.ffrgb.net" port 10011', + 'ipv4 "gw12.regensburg.freifunk.net" port 10011', 'ipv4 "gw12.ffrgb.net" port 10012', + 'ipv4 "gw12.regensburg.freifunk.net" port 10012', }, }, },