From 223875672fadd9f9f0f56f39ef63509f5f9a793a Mon Sep 17 00:00:00 2001
From: Thomas Hooge <thomas@hoogi.de>
Date: Fri, 18 Aug 2023 14:01:18 +0200
Subject: [PATCH] =?UTF-8?q?=C3=84nderungen=20f=C3=BCr=20Gluon=20v2017?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 i18n/de.po |  2 +-
 i18n/en.po |  2 +-
 site.conf  | 35 +++++++++++++++++++----------------
 site.mk    | 13 ++++++-------
 4 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/i18n/de.po b/i18n/de.po
index 552dd3f..24f7557 100644
--- a/i18n/de.po
+++ b/i18n/de.po
@@ -27,7 +27,7 @@ msgstr ""
 "Nach versenden der E-Mail kann es mitunter ein paar Stunden dauern bis dein "
 "Knoten sich verbindet.</p>"
 "<div class=\"the-key\">"
-" # <%= escape(hostname) %>"
+" # <%= pcdata(hostname) %>"
 " <br/>"
 "<%= pubkey %>"
 "</div>"
diff --git a/i18n/en.po b/i18n/en.po
index 9914f4e..c8ad38a 100644
--- a/i18n/en.po
+++ b/i18n/en.po
@@ -24,7 +24,7 @@ msgstr ""
 "<a href=\"mailto:keys@freifunk-prignitz.de\">keys@freifunk-prignitz.de</a>."
 "After sending the mail it can take a few hours until your node gets connected.</p>"
 "<div class=\"the-key\">"
-" # <%= escape(hostname) %>"
+" # <%= pcdata(hostname) %>"
 " <br/>"
 "<%= pubkey %>"
 "</div>"
diff --git a/site.conf b/site.conf
index ad48600..fccc0b7 100644
--- a/site.conf
+++ b/site.conf
@@ -40,24 +40,27 @@
 		ip6 = 'fde8:21c6:370b::1',
 		mac = '16:41:95:40:f7:dc'
 	},
-	fastd_mesh_vpn = {
-		methods = { 'salsa2012+umac' },
+	mesh_vpn = {
+		enabled = true,
 		mtu = 1426,
-		groups = {
-			backbone = {
-				limit = 1,
-				peers = {
-					gate01 = {
-						key = '1ea68435d6676d3cd26693f1775eed5113c909a9b3d373dd71e7dd925ab95278',
-						remotes = {
-							'ipv4 "gate01.freifunk-prignitz.de" port 10000'
-						},
-					},
-					gate02 = {
-						key = '886380d6799e2c25f9b89739cab74b9294dec58372ecb7c3cf5bb8f07bd36227',
-						remotes = {
-							'ipv4 "gate02.freifunk-prignitz.de" port 10000'
+		fastd = {
+			methods = { 'salsa2012+umac' },
+			groups = {
+				backbone = {
+					limit = 1,
+					peers = {
+						gate01 = {
+							key = '1ea68435d6676d3cd26693f1775eed5113c909a9b3d373dd71e7dd925ab95278',
+							remotes = {
+								'ipv4 "gate01.freifunk-prignitz.de" port 10000'
+							},
 						},
+						gate02 = {
+							key = '886380d6799e2c25f9b89739cab74b9294dec58372ecb7c3cf5bb8f07bd36227',
+							remotes = {
+								'ipv4 "gate02.freifunk-prignitz.de" port 10000'
+							},
+						}
 					}
 				}
 			}
diff --git a/site.mk b/site.mk
index 5f649ef..3f1d9f0 100644
--- a/site.mk
+++ b/site.mk
@@ -12,12 +12,11 @@ GLUON_SITE_PACKAGES := \
 	gluon-ebtables-filter-multicast \
 	gluon-ebtables-filter-ra-dhcp \
 	gluon-ebtables-segment-mld \
-	gluon-luci-admin \
-	gluon-luci-autoupdater \
-	gluon-luci-portconfig \
-	gluon-luci-wifi-config \
-	gluon-luci-node-role \
-	gluon-next-node \
+	gluon-web-admin \
+	gluon-web-autoupdater \
+	gluon-web-portconfig \
+	gluon-web-wifi-config \
+	gluon-web-node-role \
 	gluon-mesh-vpn-fastd \
 	gluon-radvd \
 	gluon-setup-mode \
@@ -103,7 +102,7 @@ GLUON_SITE_PACKAGES += \
 	$(USB_PACKAGES_STORAGE)
 endif
 
-DEFAULT_GLUON_RELEASE := 0.8.1
+DEFAULT_GLUON_RELEASE := 0.9
 
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)