From b1f4879de018d5386bb7a3bc7ed126a19ad2b3db Mon Sep 17 00:00:00 2001 From: Bastian Date: Sun, 22 Nov 2020 18:37:27 +0000 Subject: [PATCH] Use 2020.2.2, add broker entpoind host --- Makefile | 2 +- domains/ffrgb_tst.conf | 3 ++- site.mk | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 580ec6d..ce4eb29 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon -GLUON_GIT_REF := v2020.2.1 +GLUON_GIT_REF := 21151062af4a0141ad6c6855682ff5de255db146 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key diff --git a/domains/ffrgb_tst.conf b/domains/ffrgb_tst.conf index 043ceab..79ed737 100644 --- a/domains/ffrgb_tst.conf +++ b/domains/ffrgb_tst.conf @@ -62,7 +62,8 @@ { publickey ='SfVwYUjy2b9AZ+R/JTwmLXz5jm1UEmnfuRMGpN9B4X4=', endpoint ='gw31.ffrgb.net:40001', - link_address='fdef:f30f:2342:cafe::31', + broker ='gw31.ffrgb.net', + link_address='fe80::31', }, }, }, diff --git a/site.mk b/site.mk index 6e83701..933ca90 100644 --- a/site.mk +++ b/site.mk @@ -5,7 +5,6 @@ GLUON_SITE_PACKAGES := \ gluon-config-mode-core \ gluon-config-mode-autoupdater \ gluon-config-mode-hostname \ - gluon-config-mode-mesh-vpn \ gluon-config-mode-domain-select \ gluon-config-mode-geo-location \ gluon-config-mode-contact-info \