README.md

@@ -1,26 +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
 - 0.7.1:  v2015.1.1
 - 0.7:    skipped

i18n/de.po

@@ -15,19 +15,17 @@ msgstr ""
 "Willkommen zum Einrichtungsassistenten für deinen neuen Helgoländer "
 "Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen "
 "entsprechend aus und sende es ab. "
-"Den unten anzugebenden Knotennamen kannst du beliebig wählen. Denke Dir "
+"Den unten anzugebenden Knotennamen kannst du beliebig wählen. Denke Dir also etwas schönes aus. Er ist der Name des Knotens im Netzwerk und hat nichts mit dem ausgestrahlten Netzwerknamen (SSID) zu tun. Letzterer ist immer helgoland.freifunk.net."
-"also etwas schönes aus. Er ist der Name des Knotens im Netzwerk und hat "
-"nichts mit dem ausgestrahlten Netzwerknamen (SSID) zu tun. Letzterer ist "
-"immer <tt>helgoland.freifunk.net</tt>."
 
 msgid "gluon-config-mode:pubkey"
 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. "
+"Bitte trage dazu diesen Schlüssel, den Namen deines Knotens (<em><%=hostname%></em>) und ein paar andere Informationen unter "
+"<a href=\"http://formular.helgoland.freifunk.net/#/new?hostname=<%=hostname%>&key=<%=pubkey%>&mac=<%= sysconfig.primary_mac %>\" target=\"_blank\">http://formular.helgoland.freifunk.net/</a> ein.</p>"
 "<div class=\"the-key\">"
-" # <%= pcdata(hostname) %>"
+" # <%= hostname %>"
 " <br/>"
 "<%= pubkey %>"
 "</div>"
@@ -35,34 +33,15 @@ msgstr ""
 msgid "gluon-config-mode:reboot"
 msgstr ""
 "<p>Dein Knoten startet gerade neu und wird anschließend versuchen, "
-"sich mit anderen Freifunkknoten in seiner Nähe zu verbinden. "
+"sich mit anderen Freifunkknoten in seiner Nähe zu "
-"Weitere Informationen zur Helgoländer Freifunk-Community findest du auf "
+"verbinden. Weitere Informationen zur "
+"Helgoländer Freifunk-Community findest du auf "
 "<a href=\"http://helgoland.freifunk.net/\">unserer Webseite</a>.</p>"
 "<p>Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!</p>"
 
 msgid "gluon-config-mode:nopubkey"
 msgstr ""
-"<p>Eine Eintragung deines Knotens ist nicht erforderlich. Den Namen und "
+"Bitte trage nun den Namen deines Knotens "
-"die Koordinaten kannst du im Config-Mode jederzeit selber ändern. "
+"(<em><%=hostname%></em>) und ein paar andere Informationen unter "
-"Die Informationen werden dann automatisch in die Karte übernommen.</p>"
+"<a href=\"http://formular.helgoland.freifunk.net/#/new?hostname=<%=hostname%>&mac=<%= sysconfig.primary_mac %>\" target=\"_blank\">http://formular.helgoland.freifunk.net/</a> "
-
+"ein."
-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><%=hostname%></em>), and a bit of additional info at "
+"<a href=\"http://formular.helgoland.freifunk.net/#/new?hostname=<%=hostname%>&key=<%=pubkey%>&mac=<%= sysconfig.primary_mac %>\" target=\"_blank\">http://formular.helgoland.freifunk.net/</a>.</p>"
 "<div class=\"the-key\">"
-" # <%= pcdata(hostname) %>"
+" # <%= 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><%=hostname%></em>) and some additional information at "
-msgid "gluon-luci-node-role:role:node"
+"<a href=\"http://formular.helgoland.freifunk.net/#/new?hostname=<%=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,5 @@
+GLUON_SITE_FEEDS='ffhh_packages'
+
+PACKAGES_FFHH_PACKAGES_REPO=git://github.com/freifunkhamburg/ffhh-packages.git
+PACKAGES_FFHH_PACKAGES_COMMIT=58a026ad0dbea4bd2727ce30a410bd9c6fdbaaa7
+

site.conf

@@ -1,13 +1,12 @@
 {
-	hostname_prefix = 'helgo-',
+	hostname_prefix = 'GibMirEinenNamen',
 	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',
 		},
 	},
 
@@ -20,10 +19,6 @@
 
 	wifi24 = {
 		channel = 1,
-
-		supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-		basic_rate = {6000, 9000, 18000, 36000, 54000},
-
 		ap = {
 			ssid = 'helgoland.freifunk.net',
 		},
@@ -50,31 +45,29 @@
 		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,
-		mtu = 1406,
-		fastd = {
 		methods = {'salsa2012+umac'},
+		mtu = 1406,
 		groups = {
 			backbone = {
 				limit = 1,
 				peers = {
-						gw02 = {
+					gateway01 = {
-							key = '49fed2d52d01e35be758158bdbaa6ca52365c9c847da050cb5f3c67fe32a9d7c',
+						key = '2fa171346f800313145064d5e760af52069a3f3c6d1805c0393c747843b0eb8e',
-							remotes = {'"gw02.helgoland.freifunk.net" port 10000'},
+						remotes = {'"gw01.helgoland.freifunk.net" port 10100'},
 					},
-						gw03 = {
+					gateway02 = {
-							key = '73986bd367e8f276c08126e6595448c9b1976dfc61151ae9a399677cca11ac25',
+						key = 'f162c28d1f8f08cc9a6673126fd2d89e29c906c2901a9d8a39ade5ca85a32542',
-							remotes = {'"gw03.helgoland.freifunk.net" port 10000'},
+						remotes = {'"gw02.helgoland.freifunk.net" port 10100'},
 					},
+					gateway03 = {
+						key = '164b49d6897633e32cf93feb0249072a4315a32f08444309e0f524f0e55c1250',
+						remotes = {'"gw03.helgoland.freifunk.net" port 10100'},
+					},
+					gateway04 = {
+						key = '4966066b42bf72c175a381118f47806ccc57e75a0a61bba03043e617076b8b05',
+						remotes = {'"gw04.helgoland.freifunk.net" port 10100'},
 					},
 				},
 			},
@@ -94,10 +87,9 @@
 				mirrors = {'http://1.updates.services.helgo/stable/sysupgrade','http://2.updates.services.helgo/stable/sysupgrade'},
 				good_signatures = 2,
 				pubkeys = {
+					'aee22cdc38b5d792cfc360d11030953ddaea65ad52e7a9a3879e2aa7e2bf9e8b', -- A.Bernhardt
 					'874a73fab024e3dea99ef4b843ace2b97910fddde9911ce308b1d52add236270', -- bdobe
 					'76911ba14827d95bf4721297f2f421a697824cc14026e42316f18b392bacc11c', -- Entil\'Zha
-					'81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas
-					'73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin
 				},
 			},
 			beta = {
@@ -105,11 +97,9 @@
 				mirrors = {'http://1.updates.services.helgo/beta/sysupgrade','http://2.updates.services.helgo/beta/sysupgrade'},
 				good_signatures = 2,
 				pubkeys = {
-					'5197c6033a6d4d3d0521701345116f3ac18270b3f4c32ec7673e87b32107243b', -- Develop
+					'aee22cdc38b5d792cfc360d11030953ddaea65ad52e7a9a3879e2aa7e2bf9e8b', -- A.Bernhardt
 					'874a73fab024e3dea99ef4b843ace2b97910fddde9911ce308b1d52add236270', -- bdobe
 					'76911ba14827d95bf4721297f2f421a697824cc14026e42316f18b392bacc11c', -- Entil\'Zha
-					'81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas
-					'73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin
 				},
 			},
 			experimental = {
@@ -117,24 +107,9 @@
 				mirrors = {'http://1.updates.services.helgo/experimental/sysupgrade','http://2.updates.services.helgo/experimental/sysupgrade'},
 				good_signatures = 1,
 				pubkeys = {
-					'5197c6033a6d4d3d0521701345116f3ac18270b3f4c32ec7673e87b32107243b', -- Develop
+					'fcd387541ae051eb02f18fd7883e6abb1b7f4c0bcf6ef1ae641a80be49e23d84', -- 1.builder
-					'81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas
-					'73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin
 				},
 			},
 		},
 	},
-	poe_passthrough = false,
-	roles = {
-		default = 'node',
-		list = {
-			'node',
-			'temp',
-			'mobile',
-			'offloader',
-			'service',
-			'test',
-			'hidden',
-		},
-	},
 }

site.mk

@@ -1,39 +1,38 @@
 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-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-next-node \
-	gluon-web-wifi-config \
-	gluon-web-node-role \
 	gluon-mesh-vpn-fastd \
 	gluon-radvd \
 	gluon-respondd \
+	gluon-setup-mode \
 	gluon-status-page \
+	fastd-traffic-status \
 	iwinfo \
 	iptables \
 	haveged
 
-DEFAULT_GLUON_RELEASE := 0.11
+
+
+DEFAULT_GLUON_RELEASE := 0.8
+# 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_LANGS ?= en de