Merge branch 'testing' into stable

extra/template.conf

@@ -82,11 +82,7 @@
 					-- list all available vpn servers
 					peers = {
 						gw01 = {
-							-- public fastd key of the vpn server
 							key = '97bc56ae561f67cfe15364134868c3553b5f1eab06f7bd9c5b93fbf280a52b51',
-							-- remotes is an array of ways on how to reach the VPN server
-							-- Use public addresses here, these addresses are used when the mesh might not be connected yet.
-							-- format: '[|ipv4|ipv6] "hostname-or-ip-address" port 10000'
 							remotes = {
 								'"gw01.ffho.net" port 100%ID',
 								'ipv6 "2001:638:502:1884::185" port 100%ID',
@@ -125,14 +121,6 @@
 								'ipv4 "192.26.175.183" port 100%ID',
 							},
 						},
-						gw06 = {
-							key = '88b570c4cc811259b7c4106943098c9bee1126d692ddacedd23cd48efc28b0bf',
-							remotes = {
-								'"gw06.ffho.net" port 100%ID',
-								'ipv6 "2a02:cbf4:102::22" port 100%ID',
-								'ipv4 "213.131.234.22" port 100%ID',
-							},
-						},
 					},
 				},
 			},

modules

@@ -2,4 +2,4 @@ GLUON_SITE_FEEDS='ffho'
 
 PACKAGES_FFHO_REPO=https://git.ffho.net/freifunkhochstift/ffho-packages.git
 PACKAGES_FFHO_BRANCH=master
-PACKAGES_FFHO_COMMIT=14a8489c0d844c7aba48fbdc9a72819242986454
+PACKAGES_FFHO_COMMIT=0cc6f952e9489bf0794b906f70285fef14bb56e3

site.conf

@@ -45,6 +45,7 @@
 		-- fastd (vpn) settings
 		fastd = {
 			-- cipher(s) to use
+			configurable = true,
 			methods = {'salsa2012+umac'},
 		},
 

site.mk

@@ -10,6 +10,7 @@ GLUON_FEATURES := \
         respondd \
         status-page \
         web-advanced \
+	web-mesh-vpn-fastd \
         web-wizard
 
 GLUON_SITE_PACKAGES := \
@@ -53,7 +54,7 @@ ifeq ($(GLUON_TARGET),x86-64)
 endif
 
 # 0.2~1 < 0.2 < 0.2+1 < 0.2-1 < 0.2.1 < 0.3
-DEFAULT_GLUON_RELEASE := 1.4.0~exp$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := 1.4.1~exp$(shell date '+%Y%m%d')
 DEFAULT_GLUON_PRIORITY := 0
 
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)