From 2307d52be55f76f3e09fd310d73a5c9b4e98d7ea Mon Sep 17 00:00:00 2001 From: Martin/Geno Date: Fri, 19 Jul 2019 00:20:09 +0200 Subject: [PATCH] update mmfd + migrate to babel-gw-lwlcom (incompatible to prev mmfd version) --- gluon | 2 +- modules | 2 +- site.conf | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gluon b/gluon index 2b2acaf..8103e6c 160000 --- a/gluon +++ b/gluon @@ -1 +1 @@ -Subproject commit 2b2acaf271fd4e6452b47ae378848ff0cf0e65a6 +Subproject commit 8103e6c3af2c4a3b4281db8a64a4b642dd63b689 diff --git a/modules b/modules index 647cab8..00d5add 100644 --- a/modules +++ b/modules @@ -4,4 +4,4 @@ PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git PACKAGES_FFHB_COMMIT=e314a51ebbd5e8b6da3ab2744354869b7740913a PACKAGES_FFFFMPACKAGES_REPO=git://github.com/freifunk-ffm/packages.git -PACKAGES_FFFFMPACKAGES_COMMIT=3681b458e0060ba3b5580f8bedaeef89327023be +PACKAGES_FFFFMPACKAGES_COMMIT=91d343b09f6503ecd7d5b7dd7798965996893210 diff --git a/site.conf b/site.conf index 2b55126..6933577 100644 --- a/site.conf +++ b/site.conf @@ -10,7 +10,7 @@ timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin ntp_servers = { - '4.ntp.bremen.freifunk.net', + '2a06:8782:ffbb:bab0::9', }, regdom = 'DE', @@ -45,7 +45,7 @@ }, dns = { servers = { - '2a06:8782:ffbb:bab0::4', + '2a06:8782:ffbb:bab0::9', }, }, @@ -59,11 +59,11 @@ backbone = { limit = '1', -- currently unused peers = { - vpn04 = { + lwlcomGW = { enabled = true, - key ='ih0oVlwTSI1TfsKSxDW5hS3i3jaIsuk75Uh8/J3mQxw=', - remote = 'vpn04.bremen.freifunk.net', - broker_port = '40999', + key ='XA7WDD0pzgzxAGHNbbtcuDxxKJiX7x4ZCm/0XBKVOwM=', + remote = 'babel-gw-lwlcom.bremen.freifunk.net', + broker_port = '1999', }, }, },