diff --git a/README.md b/README.md index a853d4e..a9245f1 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,28 @@ -#### 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 +Dies sind die Informationen für die experimentelle Version + + 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 + cd site + git checkout experimental + cd .. + make update + make GLUON_TARGET=ar71xx-generic GLUON_BRANCH=experimental -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 diff --git a/i18n/de.po b/i18n/de.po index 4f849f8..83cee87 100644 --- a/i18n/de.po +++ b/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. " "
" -" # <%= escape(hostname) %>" +" # <%= pcdata(hostname) %>" "
" "<%= pubkey %>" "
" diff --git a/i18n/en.po b/i18n/en.po index 3421d40..4ced1bb 100644 --- a/i18n/en.po +++ b/i18n/en.po @@ -26,7 +26,7 @@ msgstr "" "the Freifunk Helgoland servers. " "Please transfer your key to the administration of our community. " "
" -" # <%= escape(hostname) %>" +" # <%= pcdata(hostname) %>" "
" "<%= pubkey %>" "
" diff --git a/site.conf b/site.conf index bc72dbc..09ef162 100644 --- a/site.conf +++ b/site.conf @@ -4,7 +4,7 @@ site_code = 'helgo', opkg = { - openwrt = 'http://opkg.services.ffhh/%n/%v/%S/packages', + lede = 'http://opkg.services.helgo/%n/%v/%S/packages', extra = { modules = 'http://updates.helgoland.freifunk.net/experimental/modules/gluon-%GS-%GR/%S', }, @@ -49,21 +49,23 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { + mesh_vpn = { enabled = true, - methods = {'salsa2012+umac'}, mtu = 1406, - 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'}, + 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'}, + }, }, }, }, diff --git a/site.mk b/site.mk index e0b550c..1ea1443 100644 --- a/site.mk +++ b/site.mk @@ -11,13 +11,12 @@ GLUON_SITE_PACKAGES := \ gluon-ebtables-filter-multicast \ gluon-ebtables-filter-ra-dhcp \ gluon-ebtables-segment-mld \ - gluon-luci-admin \ - gluon-luci-autoupdater \ - gluon-luci-portconfig \ - gluon-luci-private-wifi \ - gluon-luci-wifi-config \ - gluon-luci-node-role \ - gluon-next-node \ + 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 \ @@ -27,7 +26,7 @@ GLUON_SITE_PACKAGES := \ iptables \ haveged -DEFAULT_GLUON_RELEASE := 0.9.1+exp$(shell date '+%Y%m%d') +DEFAULT_GLUON_RELEASE := 0.10+exp$(shell date '+%Y%m%d') # Allow overriding the release number from the command line GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)