README.md

@@ -1,24 +1,16 @@
-#### Erstellen der Freifunk Helgoland Firmware
+#### How to build the Freifunk Helgoland Firmware
 
-    git clone https://github.com/freifunk-gluon/gluon.git
+    git clone https://github.com/freifunk-gluon/gluon.git                  # Get the official Gluon repository
     cd gluon
-    git clone https://git.pinneberg.freifunk.net/thooge/site-helgo.git site
+    git clone https://github.com/freifunk-helgoland/site-helgo.git site    # Get the Freifunk Helgoland site repository
-    make update
+    make update                                                          # Get other repositories used by Gluon
-    make GLUON_TARGET=ar71xx-generic GLUON_BRANCH=stable
+    make                                                                 # Build Gluon
 
-Im [offiziellen Gluon-Repository](https://github.com/freifunk-gluon/gluon)
+Please see [the official Gluon repository](https://github.com/freifunk-gluon/gluon) for an in-depth explanation of the build process.
-ist der Build-Vorgang detailliert beschrieben.
 
-Weitere Hinweise sind auch im Pinneberger Wiki unter
-https://wiki.pinneberg.freifunk.net/firmware
-zu finden.
 
-#### Gluon-Versionen für Helgoländer Firmware
+#### Gluon versions used for specific Helgoland Freifunk Firmware builds
 
-- 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
 - 0.8:    v2016.1.2

i18n/de.po

@@ -25,9 +25,8 @@ msgstr ""
 "<p>Dies ist der öffentliche Schlüssel deines Freifunkknotens. Erst nachdem "
 "er auf den Servern des Helgoländer Freifunk-Projektes eingetragen wurde, "
 "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\">"
-" # <%= pcdata(hostname) %>"
+" # <%= escape(hostname) %>"
 " <br/>"
 "<%= pubkey %>"
 "</div>"
@@ -45,24 +44,3 @@ msgstr ""
 "<p>Eine Eintragung deines Knotens ist nicht erforderlich. Den Namen und "
 "die Koordinaten kannst du im Config-Mode jederzeit selber ändern. "
 "Die Informationen werden dann automatisch in die Karte übernommen.</p>"
-
-msgid "gluon-luci-node-role:role:node"
-msgstr "Normaler Knoten"
-
-msgid "gluon-luci-node-role:role:temp"
-msgstr "Knoten nicht 24/7 verfügbar"
-
-msgid "gluon-luci-node-role:role:mobile"
-msgstr "Mobiler Knoten"
-
-msgid "gluon-luci-node-role:role:offloader"
-msgstr "VPN Offloader"
-
-msgid "gluon-luci-node-role:role:service"
-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

@@ -17,16 +17,17 @@ msgstr ""
 "You're free to choose your own node name in the field below, so "
 "come up with something nice. This will be the name of the node in "
 "the network and has nothing to do with the broadcast network name (SSID). "
-"The latter is always <tt>helgoland.freifunk.net</tt>."
+"The latter is always helgoland.freifunk.net."
 
 msgid "gluon-config-mode:pubkey"
 msgstr ""
 "<p>This is the public key for your Freifunk node. You can only "
 "connect the node to the Helgoland mesh VPN after the key has been registered on "
 "the Freifunk Helgoland servers. "
-"Please transfer your key to the administration of our community. "
+"Please register your key, the name of your node (<em><%=escape(hostname)%></em>), and a bit of additional info at "
+"<a href=\"http://formular.helgoland.freifunk.net/#/new?hostname=<%=escape(hostname)%>&key=<%=pubkey%>&mac=<%= sysconfig.primary_mac %>\" target=\"_blank\">http://formular.helgoland.freifunk.net/</a>.</p>"
 "<div class=\"the-key\">"
-" # <%= pcdata(hostname) %>"
+" # <%= escape(hostname) %>"
 " <br/>"
 "<%= pubkey %>"
 "</div>"
@@ -41,25 +42,7 @@ msgstr ""
 
 msgid "gluon-config-mode:nopubkey"
 msgstr ""
-"A node registration is not needed. Everything works automatically. Have fun! "
+"Please enter the name of your node "
-
+"(<em><%=escape(hostname)%></em>) and some additional information at "
-msgid "gluon-luci-node-role:role:node"
+"<a href=\"http://formular.helgoland.freifunk.net/#/new?hostname=<%=escape(hostname)%>&mac=<%= sysconfig.primary_mac %>\" target=\"_blank\">http://formular.helgoland.freifunk.net/</a> "
-msgstr "Normal Node"
+"."
-
-msgid "gluon-luci-node-role:role:temp"
-msgstr "Node not available 24/7"
-
-msgid "gluon-luci-node-role:role:mobile"
-msgstr "Mobile Node"
-
-msgid "gluon-luci-node-role:role:offloader"
-msgstr "VPN Offloader"
-
-msgid "gluon-luci-node-role:role:service"
-msgstr "Service Node"
-
-msgid "gluon-luci-node-role:role:test"
-msgstr "Test Node"
-
-msgid "gluon-luci-node-role:role:hidden"
-msgstr "Hidden Node"

modules

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

site.conf

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

site.mk

@@ -1,39 +1,46 @@
 GLUON_SITE_PACKAGES := \
-	gluon-mesh-batman-adv-15 \
+	gluon-mesh-batman-adv-14 \
 	gluon-alfred \
 	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-config-mode-reboot-ffhh \
 	gluon-ebtables-filter-multicast \
 	gluon-ebtables-filter-ra-dhcp \
-	gluon-ebtables-limit-arp \
+	gluon-ebtables-segment-mld \
-	gluon-web-admin \
+	gluon-luci-admin \
-	gluon-web-autoupdater \
+	gluon-luci-autoupdater \
-	gluon-web-network \
+	gluon-luci-portconfig \
-	gluon-web-private-wifi \
+	gluon-luci-private-wifi \
-	gluon-web-wifi-config \
+	gluon-luci-wifi-config \
-	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.11
+
+
+DEFAULT_GLUON_RELEASE := 0.8.2
+# for experimental firmware:
+# DEFAULT_GLUON_RELEASE := 0.6+exp$(shell date '+%Y%m%d')
 
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
 
-GLUON_PRIORITY ?= 2
+GLUON_PRIORITY ?= 0
 
 # Region code required for some images; supported values: us eu
 GLUON_REGION ?= eu
 
-GLUON_WLAN_MESH ?= 11s
+GLUON_ATH10K_MESH ?= 11s
 
 GLUON_LANGS ?= en de