backported PR's for domain-selct

This commit is contained in:
Bastian 2018-01-16 19:22:33 +01:00
parent e65acd9c38
commit 9bf012222e
2 changed files with 8 additions and 2 deletions

View File

@ -1,6 +1,6 @@
GLUON_BUILD_DIR := gluon-build GLUON_BUILD_DIR := gluon-build
GLUON_GIT_URL := https://github.com/kb-light/gluon GLUON_GIT_URL := https://github.com/ffrgb/gluon
GLUON_GIT_REF := c644d5276c8183799b852b51c818c45f740b21e0 GLUON_GIT_REF := 114bbd4f0bf6b96032e92bcefa8a0a02c0c7f553
#https://github.com/freifunk-gluon/gluon/commit/6b8888fe5aebd941c5e7a83a97ceb0678bee4c43 #https://github.com/freifunk-gluon/gluon/commit/6b8888fe5aebd941c5e7a83a97ceb0678bee4c43

View File

@ -71,16 +71,22 @@
key = '86a4dcdbaba87fe30da03cc398a083d7a0725c44dac733b583515b188fdc63dd', key = '86a4dcdbaba87fe30da03cc398a083d7a0725c44dac733b583515b188fdc63dd',
remotes = { remotes = {
'ipv4 "gw11.ffrgb.net" port 10010', 'ipv4 "gw11.ffrgb.net" port 10010',
'ipv4 "gw11.regensburg.freifunk.net" port 10010',
'ipv4 "gw11.ffrgb.net" port 10011', 'ipv4 "gw11.ffrgb.net" port 10011',
'ipv4 "gw11.regensburg.freifunk.net" port 10011',
'ipv4 "gw11.ffrgb.net" port 10012', 'ipv4 "gw11.ffrgb.net" port 10012',
'ipv4 "gw11.regensburg.freifunk.net" port 10012',
}, },
}, },
gwsec = { --[[ coldstandby ]] gwsec = { --[[ coldstandby ]]
key = '', key = '',
remotes = { remotes = {
'ipv4 "gw12.ffrgb.net" port 10010', 'ipv4 "gw12.ffrgb.net" port 10010',
'ipv4 "gw12.regensburg.freifunk.net" port 10010',
'ipv4 "gw12.ffrgb.net" port 10011', 'ipv4 "gw12.ffrgb.net" port 10011',
'ipv4 "gw12.regensburg.freifunk.net" port 10011',
'ipv4 "gw12.ffrgb.net" port 10012', 'ipv4 "gw12.ffrgb.net" port 10012',
'ipv4 "gw12.regensburg.freifunk.net" port 10012',
}, },
}, },
}, },