Änderungen für Gluon v2018

Readme aktualisiert
Änderungen für Gluon v2017
2023-08-24 12:53:06 +02:00 · 2023-08-22 11:56:12 +02:00 · 2023-08-16 11:42:12 +02:00 · 2023-01-28 08:40:56 +01:00 · 2023-01-21 19:03:36 +01:00 · 2020-06-14 14:20:08 +02:00
6 changed files with 257 additions and 113 deletions
--- a/README.md
+++ b/README.md
@ -1,15 +1,27 @@
-#### How to build the Freifunk Helgoland Firmware
-    
-    git clone https://github.com/freifunk-gluon/gluon.git                  # Get the official Gluon repository
+#### Erstellen der Freifunk Helgoland Firmware
+
+    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
-    make update                                                          # Get other repositories used by Gluon
-    make                                                                 # Build Gluon
+    git clone https://git.pinneberg.freifunk.net/thooge/site-helgo.git site
+    make update
+    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
-
- 0.6: v2014.4
+#### 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
+- 0.8:    v2016.1.2
+- 0.7.1:  v2015.1.1
+- 0.7:    skipped
+- 0.6:    v2014.4
--- a/i18n/de.po
+++ b/i18n/de.po
@ -0,0 +1,68 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2015-07-10 22:00+0100\n"
+"Last-Translator: bdobe\n"
+"Language-Team: German\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "gluon-config-mode:welcome"
+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 "
+"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. "
+"<div class=\"the-key\">"
+" # <%= pcdata(hostname) %>"
+" <br/>"
+"<%= pubkey %>"
+"</div>"
+
+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. "
+"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 "
+"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"
--- a/i18n/en.po
+++ b/i18n/en.po
@ -0,0 +1,65 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2015-07-10 22:00+0100\n"
+"Last-Translator: bdobe\n"
+"Language-Team: English\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "gluon-config-mode:welcome"
+msgstr ""
+"Welcome the the setup wizard for your new Freifunk Helgoland node. "
+"Please fill out and then transmit the following form. "
+"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>."
+
+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. "
+"<div class=\"the-key\">"
+" # <%= pcdata(hostname) %>"
+" <br/>"
+"<%= pubkey %>"
+"</div>"
+
+msgid "gluon-config-mode:reboot"
+msgstr ""
+"<p>The node is currently rebooting and, afterwards, will try to connect to other "
+"nearby Freifunk nodes. "
+"You can find lots more information about the Freifunk Helgoland community on "
+"<a href=\"http://helgoland.freifunk.net/\">our homepage</a>.</p>"
+"<p>Have fun with your node and exploring the Freifunk network!</p>"
+
+msgid "gluon-config-mode:nopubkey"
+msgstr ""
+"A node registration is not needed. Everything works automatically. Have fun! "
+
+msgid "gluon-luci-node-role:role:node"
+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"
--- a/4
+++ b/4
@ -1,4 +0,0 @@
-GLUON_SITE_FEEDS='ffhh_packages'
-
-PACKAGES_FFHH_PACKAGES_REPO=git://github.com/freifunkhamburg/ffhh-packages.git
-PACKAGES_FFHH_PACKAGES_COMMIT=918d892f15aaf82417b642dc8cd87993bde9d7d6
--- a/site.conf
+++ b/site.conf
@ -1,8 +1,15 @@
 {
-	hostname_prefix = 'GibMirEinenNamen',
+	hostname_prefix = 'helgo-',
 	site_name = 'Freifunk Helgoland',
 	site_code = 'helgo',
-	opkg_repo = 'http://opkg.services.helgo/barrier_breaker/14.07/%S/packages',
+	domain_seed = '34e135f273207a8085e4f08e4ac7d0e65302d9780f26b1640d66542d9e0d6323',
+
+	opkg = {
+		openwrt = 'http://opkg.services.helgo/%n/%v/%S/packages',
+		extra = {
+			modules = 'http://updates.helgoland.freifunk.net/stable/modules/gluon-%GS-%GR/%S',
+		},
+	},

 	prefix4 = '10.189.0.0/18',
 	prefix6 = '2a03:2267:4e16:01ad::/64',
@ -12,20 +19,29 @@
 	regdom = 'DE',

 	wifi24 = {
-		ssid = 'helgoland.freifunk.net',
 		channel = 1,
-		htmode = 'HT20',
-		mesh_ssid = '14:cc:20:92:0f:e9',
-		mesh_bssid = '14:cc:20:92:0f:e9',
-		mesh_mcast_rate = 12000,
+
+		supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+		basic_rate = {6000, 9000, 18000, 36000, 54000},
+
+		ap = {
+			ssid = 'helgoland.freifunk.net',
+		},
+		mesh = {
+			id = 'ff-helgo-mesh',
+			mcast_rate = 12000,
+		},
 	},
+
 	wifi5 = {
-		ssid = 'helgoland.freifunk.net',
 		channel = 44,
-		htmode = 'HT40+',
-		mesh_ssid = '14:cc:20:92:0f:e9',
-		mesh_bssid = '14:cc:20:92:0f:e9',
-		mesh_mcast_rate = 12000,
+		ap = {
+			ssid = 'helgoland.freifunk.net',
+		},
+		mesh = {
+			id = 'ff-helgo-mesh',
+			mcast_rate = 12000,
+		},
 	},

 	next_node = {
@ -34,31 +50,40 @@
 		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,
-		backbone = {
-			limit = 2,
-			peers = {
-				gateway01 = {
-					key = '2fa171346f800313145064d5e760af52069a3f3c6d1805c0393c747843b0eb8e',
-					remotes = {'"gw01.helgoland.freifunk.net" port 10100'},
-				},
-				gateway02 = {
-					key = 'f162c28d1f8f08cc9a6673126fd2d89e29c906c2901a9d8a39ade5ca85a32542',
-					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'},
+		fastd = {
+			methods = {'salsa2012+umac'},
+			groups = {
+				backbone = {
+					limit = 1,
+					peers = {
+						gw02 = {
+							key = '49fed2d52d01e35be758158bdbaa6ca52365c9c847da050cb5f3c67fe32a9d7c',
+							remotes = {'"gw02.helgoland.freifunk.net" port 10000'},
+						},
+						gw03 = {
+							key = '73986bd367e8f276c08126e6595448c9b1976dfc61151ae9a399677cca11ac25',
+							remotes = {'"gw03.helgoland.freifunk.net" port 10000'},
+						},
+					},
 				},
 			},
 		},
+		bandwidth_limit = {
+			enabled = false,
+			ingress = 8192,
+			egress = 768,
+		},
 	},

 	autoupdater = {
@ -69,75 +94,47 @@
 				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 = {
-                                name = 'beta',
-                                mirrors = {'http://1.updates.services.helgo/beta/sysupgrade','http://2.updates.services.helgo/beta/sysupgrade'},
-                                good_signatures = 2,
-                                pubkeys = {
-					'aee22cdc38b5d792cfc360d11030953ddaea65ad52e7a9a3879e2aa7e2bf9e8b', -- A.Bernhardt
+				name = 'beta',
+				mirrors = {'http://1.updates.services.helgo/beta/sysupgrade','http://2.updates.services.helgo/beta/sysupgrade'},
+				good_signatures = 2,
+				pubkeys = {
+					'5197c6033a6d4d3d0521701345116f3ac18270b3f4c32ec7673e87b32107243b', -- Develop
 					'874a73fab024e3dea99ef4b843ace2b97910fddde9911ce308b1d52add236270', -- bdobe
 					'76911ba14827d95bf4721297f2f421a697824cc14026e42316f18b392bacc11c', -- Entil\'Zha
-                                },      
-                        },
+					'81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas
+					'73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin
+				},
+			},
 			experimental = {
 				name = 'experimental',
 				mirrors = {'http://1.updates.services.helgo/experimental/sysupgrade','http://2.updates.services.helgo/experimental/sysupgrade'},
 				good_signatures = 1,
 				pubkeys = {
-					'fcd387541ae051eb02f18fd7883e6abb1b7f4c0bcf6ef1ae641a80be49e23d84', -- 1.builder
+					'5197c6033a6d4d3d0521701345116f3ac18270b3f4c32ec7673e87b32107243b', -- Develop
+					'81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas
+					'73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin
 				},
 			},
 		},
 	},
-
-	simple_tc = {
-		mesh_vpn = {
-			ifname = 'mesh-vpn',
-			enabled = false,
-			limit_egress = 500,
-			limit_ingress = 8000,
+	poe_passthrough = false,
+	roles = {
+		default = 'node',
+		list = {
+			'node',
+			'temp',
+			'mobile',
+			'offloader',
+			'service',
+			'test',
+			'hidden',
 		},
 	},
-
-	config_mode = {
-		msg_welcome = [[
-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 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.
-]],
-                msg_nopubkey = [[
-Bitte trage nun den Namen deines Knotens
-(<em><%=hostname%></em>) und ein paar andere Informationen unter
-<a href="http://formular.helgoland.freifunk.net/#/new?hostname=<%=hostname%>&mac=<%= sysconfig.primary_mac %>" target="_blank">http://formular.helgoland.freifunk.net/</a>
-ein.
-]],
-		msg_pubkey = [[
-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
-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.
-]],
-		msg_reboot = [[
-<p>
-Dein Knoten startet gerade neu und wird anschließend versuchen,
-sich mit anderen Freifunkknoten in seiner Nähe zu
-verbinden. Weitere Informationen zur
-Helgoländer Freifunk-Community findest du auf
-<a href="https://helgoland.freifunk.net/">unserer Webseite</a>.
-</p>
-<p>
-Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!
-</p>
-]],
-	},
-
 }
--- a/site.mk
+++ b/site.mk
@ -1,33 +1,39 @@
 GLUON_SITE_PACKAGES := \
-	gluon-mesh-batman-adv-14 \
+	gluon-mesh-batman-adv-15 \
 	gluon-alfred \
-	gluon-announced \
 	gluon-autoupdater \
 	gluon-config-mode-autoupdater \
+	gluon-config-mode-contact-info \
+	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-luci-admin \
-	gluon-luci-autoupdater \
-	gluon-luci-portconfig \
-	gluon-luci-private-wifi \
-	gluon-next-node \
+	gluon-ebtables-limit-arp \
+	gluon-web-admin \
+	gluon-web-autoupdater \
+	gluon-web-network \
+	gluon-web-private-wifi \
+	gluon-web-wifi-config \
+	gluon-web-node-role \
 	gluon-mesh-vpn-fastd \
 	gluon-radvd \
+	gluon-respondd \
 	gluon-status-page \
 	iwinfo \
 	iptables \
 	haveged

-
-
-DEFAULT_GLUON_RELEASE := 0.6
-# for experimental firmware:
-# DEFAULT_GLUON_RELEASE := 0.6+exp$(shell date '+%Y%m%d')
+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_WLAN_MESH ?= 11s
+
+GLUON_LANGS ?= en de
Author	SHA1	Message	Date
Thomas Hooge	af509966d0	Änderungen für Gluon v2018	2023-08-24 12:53:06 +02:00
Thomas Hooge	9c6dc21af9	Readme aktualisiert	2023-08-22 11:56:12 +02:00
Thomas Hooge	f469b532d6	Änderungen für Gluon v2017	2023-08-16 11:42:12 +02:00
Thomas Hooge	d469752a24	README aktualisiert	2023-01-28 08:40:56 +01:00
Thomas Hooge	a228b5f9ca	Pfade für opkg gefix, Version auf 0.9.2	2023-01-21 19:03:36 +01:00
Thomas Hooge	99b000e315	Release 0.9.1; gateway01 (HH) durch gw03 (Helgo) ersetzt	2020-06-14 14:20:08 +02:00
Thomas Hooge	b51a7b8f01	Site-Feeds gefixt	2019-11-16 19:02:44 +01:00
thooge	2a047077a9	Merge pull request #1 from freifunk-pinneberg/master Änderungen für eigenständige Community	2019-11-16 18:18:28 +01:00
Thomas Hooge	418c5b9a50	Batman Kompatibilitätsmodus 15 für neues Gateway, sowie Rollen	2019-11-16 18:11:05 +01:00
Thomas Hooge	63f4a0948a	Version 0.8.2: Vorbereitung für neue Infrastruktur	2019-10-31 22:14:16 +01:00
bdobe	1f5db94412	Release v0.8.1	2017-01-31 13:30:48 +01:00
bdobe	023d19f3da	modules: Update ffhh packages	2017-01-31 13:29:36 +01:00
bdobe	df4b27ad81	site.mk: remove package fastd-traffic-status	2017-01-31 13:28:02 +01:00
bdobe	56d03086ed	site.mk: package site.mk: package gluon-luci-wifi-config added	2017-01-31 13:28:02 +01:00
bdobe	9eae8c1a81	site.mk: package gluon-ebtables-segment-mld added	2017-01-31 13:28:01 +01:00
bdobe	c087faf544	site.conf: Add PoE pass through option to config mode	2017-01-31 13:28:01 +01:00
bdobe	6f8277bb1b	site.conf: support for 802.11b data rates removed	2017-01-31 13:28:01 +01:00
bdobe	6e27c9dfae	site.mk: set GLUON_ATH10K_MESH default to 802.11s	2017-01-31 13:28:01 +01:00
bdobe	e5361f39f8	site.mk: add region code	2017-01-31 13:28:01 +01:00
bdobe	4fc0e85035	i18n: adjustments for gluon v2016.2	2017-01-31 13:28:00 +01:00
bdobe	e7797bd77d	Release v0.8	2016-03-11 19:31:00 +01:00
bdobe	dc802e4e01	New experimental releases - adapted configuration to the current gluon config file format - Add package fastd-traffic-status	2015-12-05 14:33:31 +01:00
bdobe	9fce915074	Adjustments for v0.7.1 - Adjust fastd-mesh-vpn config for nested peer groups - Add gluon-setup-mode and gluon-config-mode-core packages - Adapt configuration for multi language config mode (i18n) en/de	2015-07-11 01:04:31 +02:00