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\">"
-" # <%= pcdata(hostname) %>"
+" # <%= hostname %>"
 " <br/>"
 "<%= pubkey %>"
 "</div>"
@@ -58,6 +58,3 @@ msgstr "Knoten für Dienste"
 
 msgid "gluon-luci-node-role:role:test"
 msgstr "Knoten für Tests"
-
-msgid "gluon-luci-node-role:role:hidden"
-msgstr "Unsichtbarer Knoten"

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\">"
-" # <%= pcdata(hostname) %>"
+" # <%= hostname %>"
 " <br/>"
 "<%= pubkey %>"
 "</div>"
@@ -54,6 +54,3 @@ msgstr "Service Node"
 
 msgid "gluon-luci-node-role:role:test"
 msgstr "Test Node"
-
-msgid "gluon-luci-node-role:role:hidden"
-msgstr "Hidden Node"

site.conf

@@ -40,27 +40,24 @@
 		ip6 = 'fde8:21c6:370b::1',
 		mac = '16:41:95:40:f7:dc'
 	},
-	mesh_vpn = {
+	fastd_mesh_vpn = {
-		enabled = true,
+		methods = { 'salsa2012+umac' },
 		mtu = 1426,
-		fastd = {
+		groups = {
-			methods = { 'salsa2012+umac' },
+			backbone = {
-			groups = {
+				limit = 1,
-				backbone = {
+				peers = {
-					limit = 1,
+					gate01 = {
-					peers = {
+						key = '1ea68435d6676d3cd26693f1775eed5113c909a9b3d373dd71e7dd925ab95278',
-						gate01 = {
+						remotes = {
-							key = '1ea68435d6676d3cd26693f1775eed5113c909a9b3d373dd71e7dd925ab95278',
+							'ipv4 "gate01.freifunk-prignitz.de" port 10000'
-							remotes = {
+						},
-								'ipv4 "gate01.freifunk-prignitz.de" port 10000'
+					},
-							},
+					gate02 = {
+						key = '886380d6799e2c25f9b89739cab74b9294dec58372ecb7c3cf5bb8f07bd36227',
+						remotes = {
+							'ipv4 "gate02.freifunk-prignitz.de" port 10000'
 						},
-						gate02 = {
-							key = '886380d6799e2c25f9b89739cab74b9294dec58372ecb7c3cf5bb8f07bd36227',
-							remotes = {
-								'ipv4 "gate02.freifunk-prignitz.de" port 10000'
-							},
-						}
 					}
 				}
 			}
@@ -111,8 +108,7 @@
 			'mobile',
 			'offloader',
 			'service',
-			'test',
+			'test'
-			'hidden'
 		}
 	},
 	config_mode = {

site.mk

@@ -11,12 +11,12 @@ GLUON_SITE_PACKAGES := \
 	gluon-config-mode-mesh-vpn \
 	gluon-ebtables-filter-multicast \
 	gluon-ebtables-filter-ra-dhcp \
-	gluon-ebtables-segment-mld \
+	gluon-luci-admin \
-	gluon-web-admin \
+	gluon-luci-autoupdater \
-	gluon-web-autoupdater \
+	gluon-luci-portconfig \
-	gluon-web-network \
+	gluon-luci-wifi-config \
-	gluon-web-wifi-config \
+	gluon-luci-node-role  \
-	gluon-web-node-role \
+	gluon-next-node \
 	gluon-mesh-vpn-fastd \
 	gluon-radvd \
 	gluon-setup-mode \
@@ -102,18 +102,13 @@ GLUON_SITE_PACKAGES += \
 	$(USB_PACKAGES_STORAGE)
 endif
 
-DEFAULT_GLUON_RELEASE := 0.9
+DEFAULT_GLUON_RELEASE := 0.8
 
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
 
 GLUON_PRIORITY ?= 0
 
-# Region code required for some images; supported values: us eu
-GLUON_REGION ?= eu
-
-GLUON_ATH10K_MESH ?= 11s
-
 GLUON_LANGS ?= en de
 
 # Enable autoupdater