From bf33967a559440e8979b5e8fb8592dc9f20a24ec Mon Sep 17 00:00:00 2001
From: Martin/Geno <geno+dev@fireorbit.de>
Date: Fri, 5 Oct 2018 23:49:16 +0200
Subject: [PATCH] replace fastd with wireguard (+ ssid to
 ng-bremen.freifunk.net)

---
 .gitmodules |  2 +-
 gluon       |  2 +-
 modules     |  8 ++------
 site.conf   | 31 ++++++++-----------------------
 site.mk     |  9 ---------
 5 files changed, 12 insertions(+), 40 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index b04e1fc..8cf6535 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "gluon"]
 	path = gluon
-	url = https://github.com/freifunk-ffm/gluon.git
+	url = https://github.com/christf/gluon.git
diff --git a/gluon b/gluon
index 25e0cb2..c4c05b7 160000
--- a/gluon
+++ b/gluon
@@ -1 +1 @@
-Subproject commit 25e0cb266a4a0b391c69b231c6bf84f73c0507a1
+Subproject commit c4c05b7d86dba7c742e4c421945213b0039e8348
diff --git a/modules b/modules
index 12e04fd..b34ff29 100644
--- a/modules
+++ b/modules
@@ -1,12 +1,8 @@
-GLUON_SITE_FEEDS='ffhb ffffmpackages ffmgpackages'
+GLUON_SITE_FEEDS='ffhb ffffmpackages'
 
 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=9999a19165011c25d9fcb2f14ad668ebf1865b90
+PACKAGES_FFFFMPACKAGES_COMMIT=10ede5aab68eb22c30b0f01fd34f61714ffc0f0b
 PACKAGES_FFFFMPACKAGES_BRANCH=master
-
-PACKAGES_FFMGPACKAGES_REPO=git://github.com/freifunk-ffm/packages-1.git
-PACKAGES_FFMGPACKAGES_COMMIT=135478fec65e2218179a5db74797c78de00c6994
-PACKAGES_FFMGPACKAGES_BRANCH=mmfd
diff --git a/site.conf b/site.conf
index 4535a3b..7237027 100644
--- a/site.conf
+++ b/site.conf
@@ -3,6 +3,7 @@
 	site_code = 'ffhb',
 	domain_seed = '9c689a5be0e7610716aa9952d3c186345bd8d72dfa8950977e255e26ea24d978',
 
+	prefix4 = '10.196.0.0/17',	-- workaround to get l3roamd running
 	prefix6 = '2a06:8782:ffbb:bab1::/64',	-- (freifunk wide ip)
 	node_prefix6 = '2a06:8782:ffbb:bab0::/64',	-- (freifunk wide inter node ip)
 	node_client_prefix6 = 'fd2f:5119:f2c::/64',	-- infrastructure net (ULA) for node-client-ip addresses (node wide ip)
@@ -20,7 +21,7 @@
 		supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
 		basic_rate = {6000, 9000, 18000, 36000, 54000},
 		ap = {
-			ssid = 'babel.freifunk.net',
+			ssid = 'ng-bremen.freifunk.net',
 		},
 		mesh = {
 			id = 'meshb.ffhb.de',
@@ -30,7 +31,7 @@
 	wifi5 = {
 		channel = 44,
 		ap = {
-			ssid = 'babel.freifunk.net',
+			ssid = 'ng-bremen.freifunk.net',
 		},
 		mesh = {
 			id = 'meshb.ffhb.de',
@@ -54,22 +55,7 @@
 
 	mesh_vpn = {
 		enabled = true,
-		mtu = 1280,
-		fastd = {
-			methods = {'salsa2012+umac'},
-			configurable = true,
-			groups = {
-				backbone = {
-					limit = 1,
-					peers = {
-						vpn04 = {
-							key = '6714e89d253d260848abbd3419f6226ef8d76c64a37d300acfc13016bcad6395',
-							remotes = {'"vpn04.bremen.freifunk.net" port 50001', '"vpn04.ffhb.de" port 50001'},
-						},
-					},
-				},
-			},
-		},
+		mtu = 1374,
 		wireguard = {
 			configurable = true,
 			enabled = true,
@@ -78,11 +64,10 @@
 					limit = '1', -- currently unused
 					peers = {
 						vpn04 = {
-							iface = 'wg-mesh-vpn04',
-							enabled = '1',
-							PublicKey ='ih0oVlwTSI1TfsKSxDW5hS3i3jaIsuk75Uh8/J3mQxw=',
-							remote = 'vpn04.bremen.freifunk.net:41000',
-							broker = 'vpn04.bremen.freifunk.net:40999',
+							enabled = true,
+							key ='ih0oVlwTSI1TfsKSxDW5hS3i3jaIsuk75Uh8/J3mQxw=',
+							remote = 'vpn04.bremen.freifunk.net',
+							broker_port = '40999',
 						},
 					},
 				},
diff --git a/site.mk b/site.mk
index c744316..3d2baa3 100755
--- a/site.mk
+++ b/site.mk
@@ -12,12 +12,9 @@ GLUON_SITE_PACKAGES := \
 	gluon-config-mode-contact-info \
 	gluon-web-admin \
 	gluon-web-autoupdater \
-	gluon-web-mesh-vpn-fastd \
-	gluon-web-mesh-vpn-wireguard \
 	gluon-web-network \
 	gluon-web-private-wifi \
 	gluon-web-wifi-config \
-	gluon-mesh-vpn-fastd \
 	gluon-mesh-vpn-wireguard \
 	gluon-client-bridge \
 	gluon-radvd \
@@ -48,9 +45,3 @@ ifeq ($(GLUON_TARGET),x86-64)
 GLUON_SITE_PACKAGES += \
 	$(DEBUG_PACKAGES)
 endif
-
-# digineo
-ifeq ($(GLUON_TARGET),ramips-mt7621)
-GLUON_SITE_PACKAGES += \
-	$(DEBUG_PACKAGES)
-endif