Änderungen für Gluon v2018

README.md

@@ -1,16 +1,23 @@
-#### How to build the Freifunk Helgoland Firmware
+#### Erstellen der Freifunk Helgoland Firmware
 
-    git clone https://github.com/freifunk-gluon/gluon.git                  # Get the official Gluon repository
+    git clone https://github.com/freifunk-gluon/gluon.git
     cd gluon
-    git clone https://github.com/freifunk-helgoland/site-helgo.git site    # Get the Freifunk Helgoland site repository
+    git clone https://git.pinneberg.freifunk.net/thooge/site-helgo.git site
-    make update                                                          # Get other repositories used by Gluon
+    make update
-    make                                                                 # Build Gluon
+    make GLUON_TARGET=ar71xx-generic GLUON_BRANCH=stable
 
-Please see [the official Gluon repository](https://github.com/freifunk-gluon/gluon) for an in-depth explanation of the build process.
+Im [offiziellen Gluon-Repository](https://github.com/freifunk-gluon/gluon)
+ist der Build-Vorgang detailliert beschrieben.
 
+Weitere Hinweise sind auch im Pinneberger Wiki unter
+https://wiki.pinneberg.freifunk.net/firmware
+zu finden.
 
-#### Gluon versions used for specific Helgoland Freifunk Firmware builds
+#### Gluon-Versionen für Helgoländer Firmware
 
+- 0.10:   v2017.1.8
+- 0.9.2:  v2016.2.x latest commit
+- 0.9.1:  v2016.2.7
 - 0.9:    v2016.2.7 with batman_adv compat v15
 - 0.8.2:  v2016.2.7 new keys for new infrastructure
 - 0.8.1:  v2016.2.3

i18n/de.po

@@ -27,7 +27,7 @@ msgstr ""
 "kann sich dein Knoten mit dem Helgoländer Mesh-VPN verbinden. "
 "Bitte übermittle den Schlüssel an die Administration der Helgoländer Community. "
 "<div class=\"the-key\">"
-" # <%= escape(hostname) %>"
+" # <%= pcdata(hostname) %>"
 " <br/>"
 "<%= pubkey %>"
 "</div>"

i18n/en.po

@@ -26,7 +26,7 @@ msgstr ""
 "the Freifunk Helgoland servers. "
 "Please transfer your key to the administration of our community. "
 "<div class=\"the-key\">"
-" # <%= escape(hostname) %>"
+" # <%= pcdata(hostname) %>"
 " <br/>"
 "<%= pubkey %>"
 "</div>"

modules

@@ -1,4 +0,0 @@
-GLUON_SITE_FEEDS='ffhh_packages'
-
-PACKAGES_FFHH_PACKAGES_REPO=git://github.com/freifunkhamburg/ffhh-packages.git
-PACKAGES_FFHH_PACKAGES_COMMIT=ef9fcc1222f74c3c045b1450537a4b8b80efb56c

site.conf

@@ -2,11 +2,12 @@
 	hostname_prefix = 'helgo-',
 	site_name = 'Freifunk Helgoland',
 	site_code = 'helgo',
+	domain_seed = '34e135f273207a8085e4f08e4ac7d0e65302d9780f26b1640d66542d9e0d6323',
 
 	opkg = {
-		openwrt = 'http://opkg.services.ffhh/%n/%v/%S/packages',
+		openwrt = 'http://opkg.services.helgo/%n/%v/%S/packages',
 		extra = {
-			modules = 'http://updates.helgoland.freifunk.net/stable/archive/modules/gluon-%GS-%GR/%S',
+			modules = 'http://updates.helgoland.freifunk.net/stable/modules/gluon-%GS-%GR/%S',
 		},
 	},
 
@@ -49,21 +50,31 @@
 		mac = '16:41:95:40:f7:dc',
 	},
 
-	fastd_mesh_vpn = {
+	mesh = {
+		vxlan = false,
+		batman_adv = {
+			gw_sel_class = 20,
+			routing_algo = 'BATMAN_IV',
+		},
+	},
+
+	mesh_vpn = {
 		enabled = true,
-		methods = {'salsa2012+umac'},
 		mtu = 1406,
-		groups = {
+		fastd = {
-			backbone = {
+			methods = {'salsa2012+umac'},
-				limit = 1,
+			groups = {
-				peers = {
+				backbone = {
-					gateway01 = {
+					limit = 1,
-						key = '2fa171346f800313145064d5e760af52069a3f3c6d1805c0393c747843b0eb8e',
+					peers = {
-						remotes = {'"gw01.helgoland.freifunk.net" port 10100'},
+						gw02 = {
-					},
+							key = '49fed2d52d01e35be758158bdbaa6ca52365c9c847da050cb5f3c67fe32a9d7c',
-					gateway02 = {
+							remotes = {'"gw02.helgoland.freifunk.net" port 10000'},
-						key = '49fed2d52d01e35be758158bdbaa6ca52365c9c847da050cb5f3c67fe32a9d7c',
+						},
-						remotes = {'"gw02.helgoland.freifunk.net" port 10000'},
+						gw03 = {
+							key = '73986bd367e8f276c08126e6595448c9b1976dfc61151ae9a399677cca11ac25',
+							remotes = {'"gw03.helgoland.freifunk.net" port 10000'},
+						},
 					},
 				},
 			},

site.mk

@@ -4,39 +4,36 @@ GLUON_SITE_PACKAGES := \
 	gluon-autoupdater \
 	gluon-config-mode-autoupdater \
 	gluon-config-mode-contact-info \
-	gluon-config-mode-core \
 	gluon-config-mode-geo-location \
 	gluon-config-mode-hostname \
 	gluon-config-mode-mesh-vpn \
 	gluon-ebtables-filter-multicast \
 	gluon-ebtables-filter-ra-dhcp \
-	gluon-ebtables-segment-mld \
+	gluon-ebtables-limit-arp \
-	gluon-luci-admin \
+	gluon-web-admin \
-	gluon-luci-autoupdater \
+	gluon-web-autoupdater \
-	gluon-luci-portconfig \
+	gluon-web-network \
-	gluon-luci-private-wifi \
+	gluon-web-private-wifi \
-	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-respondd \
-	gluon-setup-mode \
 	gluon-status-page \
 	iwinfo \
 	iptables \
 	haveged
 
-DEFAULT_GLUON_RELEASE := 0.9
+DEFAULT_GLUON_RELEASE := 0.11
 
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
 
-GLUON_PRIORITY ?= 0
+GLUON_PRIORITY ?= 2
 
 # Region code required for some images; supported values: us eu
 GLUON_REGION ?= eu
 
-GLUON_ATH10K_MESH ?= 11s
+GLUON_WLAN_MESH ?= 11s
 
 GLUON_LANGS ?= en de