krombel/site-ffmuc
1
0
Fork 0
forked from remote/site-ffmuc
Code Issues 4 Pull Requests 1 Releases Wiki Activity

update to v2018.1 (see details)

Browse Source 
- update CHANGELOG.md
- updated translations (de, en)
- added french translation (just copied. Please review)
- update site.mk
  - gluon now provides a GLUON_FEATURES where all packages get
    prepended with "gluon-" automatically. This is now used
  - use GLUON_FEATURE web-wizard
This commit is contained in:
Matthias
2018-08-01 20:07:46 +02:00
parent ba03e0910f
commit 36edcdabac
8 changed files with 244 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CHANGELOG.md
View File

@@ -1,5 +1,19 @@
# Freifunk München Firmware Changelog
## v2018.1
- Updated to Gluon v2018.1
- Changes:
- https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.html
- https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.1.html
- https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.2.html
- https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.3.html
- https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.4.html
- https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.5.html
- https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.6.html
- https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.7.html
- https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.8.html
- https://gluon.readthedocs.io/en/v2016.2.7/releases/v2018.1.html
## v2017.1
- Updated to Gluon v2016.2.7

2
Makefile
View File

@@ -1,6 +1,6 @@
GLUON_BUILD_DIR := gluon-build
GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
GLUON_GIT_REF := v2017.1.2
GLUON_GIT_REF := v2018.1
SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key

51
i18n/de.po
View File

@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: PACKAGE VERSION\n"
"PO-Revision-Date: 2015-05-16 19:31+0200\n"
"Last-Translator: Franz Pletz <fpletz@fnordicwalking.de>\n"
"PO-Revision-Date: 2018-08-01 19:31+0200\n"
"Last-Translator: Matthias Kesler <krombel@krombel.de>\n"
"Language-Team: German\n"
"Language: de\n"
"MIME-Version: 1.0\n"
@@ -16,17 +16,28 @@ msgstr ""
"Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen "
"entsprechend aus und sende es ab."
msgid "gluon-config-mode:domain"
msgstr "Domäne"
msgid "gluon-config-mode:domain-select"
msgstr ""
"Hier hast du die Möglichkeit, die Mesh-Domäne, in der sich dein Knoten "
"befindet, auszuwählen. Bitte denke daran, dass sich dein Knoten nur mit den "
"Knoten der ausgewählten Domäne verbinden kann."
msgid "gluon-config-mode:pubkey"
msgstr ""
" "
msgid "gluon-config-mode:reboot"
msgstr ""
"<p>Dein Knoten startet gerade neu und wird anschließend versuchen, sich "
"mit anderen Freifunk-Knoten in seiner Nähe zu verbinden. Weitere "
"Informationen zur Münchner Freifunk-Community findest du auf "
"<a href=\"https://ffmuc.net/\">unserer Webseite</a>. Wenn "
"alles geklappt hat, wirst du in ein paar Minuten unter "
"<p>Dein Knoten <em><%= pcdata(hostname) %></em> startet gerade neu und wird "
"anschließend versuchen, sich mit anderen Freifunk-Knoten in seiner Nähe zu "
"verbinden. Weitere Informationen zur "
"Münchner Freifunk-Community findest du auf "
"<a href=\"https://ffmuc.net/\">unserer Webseite</a>.</p>"
"Wenn alles geklappt hat, wirst du in ein paar Minuten unter "
"<a href=\"https://ffmuc.net/map/\">ffmuc.net/map/</a> "
"deinen Knoten finden.</p> "
"<p>Um zu dieser Konfigurationsseite zurückzugelangen, drücke im normalen "
@@ -40,3 +51,29 @@ msgstr ""
"mitzumachen. Voraussetzung ist eine persönliche Anmeldung auf einem "
"der Treffen.</p> "
"<p>Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!</p>"
msgid "gluon-config-mode:altitude-label"
msgstr "Höhe"
msgid "gluon-config-mode:altitude-help"
msgstr ""
"Die Höhenangabe ist optional und sollte nur gesetzt werden, wenn ein "
"exakter Wert bekannt ist."
# Leave empty to use the default text, which can be found in:
# package/gluon-config-mode-hostname/i18n/
msgid "gluon-config-mode:hostname-help"
msgstr ""
# Leave empty to use the default text, which can be found in:
# package/gluon-config-mode-geo-location/i18n/
msgid "gluon-config-mode:geo-location-help"
msgstr ""
# Leave empty to use the default text, which can be found in:
# package/gluon-config-mode-contact-info/i18n/
msgid "gluon-config-mode:contact-help"
msgstr ""
msgid "gluon-config-mode:contact-note"
msgstr ""

58
i18n/en.po
View File

@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: PACKAGE VERSION\n"
"PO-Revision-Date: 2015-05-16 19:31+0200\n"
"Last-Translator: Franz Pletz <fpletz@fnordicwalking.de>\n"
"PO-Revision-Date: 2018-08-01 19:31+0200\n"
"Last-Translator: Matthias Kesler <krombel@krombel.de>\n"
"Language-Team: English\n"
"Language: en\n"
"MIME-Version: 1.0\n"
@@ -12,20 +12,64 @@ msgstr ""
msgid "gluon-config-mode:welcome"
msgstr ""
"Welcome the the setup wizard of your new Freifunk Munich node. "
"Please fill out the following form and transmit it."
"Welcome to the setup wizard of your new Freifunk Munich node. "
"Please fill out the following form and submit it."
msgid "gluon-config-mode:domain"
msgstr "Domain"
msgid "gluon-config-mode:domain-select"
msgstr ""
"Here you have the possibility of selecting the mesh domain in which your node "
"is placed. Please keep in mind that your router only connects with the nodes "
"of the selected domain"
msgid "gluon-config-mode:pubkey"
msgstr ""
" "
msgid "gluon-config-mode:novpn"
msgstr ""
"<p>You have selected <strong>not</strong> to use the mesh VPN. "
"Your node will only be able to connect to the Freifunk network if other nodes in reach "
"already have a connection.</p>"
msgid "gluon-config-mode:reboot"
msgstr ""
"<p>Your node is currently rebooting and will try to connect to other "
"nearby Freifunk nodes. It should appear on our map at "
"<p>Your node <em><%= pcdata(hostname) %></em> is currently rebooting and will "
"try to connect to other nearby Freifunk nodes after that. For more "
"information about the Freifunk community in Munich, have a look at "
"<a href=\"https://ffmuc.net/\">our homepage</a>.</p>"
"Your node should appear on our map at "
"<a href=\"https://ffmuc.net/map/\">ffmuc.net/map/</a> "
"in a few minutes.</p> "
"<p>To get back to this configuration interface, press the reset button for "
"3 seconds during normal operation. The device will then reboot into config "
"mode.</p>"
"<p>Have fun with your node and exploring the Freifunk network!</p>"
"<p>Have fun with your node and exploring of the Freifunk network!</p>"
msgid "gluon-config-mode:altitude-label"
msgstr "Altitude"
msgid "gluon-config-mode:altitude-help"
msgstr ""
"Specifying the altitude is optional and should only be done if a proper "
"value is known."
# Leave empty to use the default text, which can be found in:
# package/gluon-config-mode-hostname/i18n/
msgid "gluon-config-mode:hostname-help"
msgstr ""
# Leave empty to use the default text, which can be found in:
# package/gluon-config-mode-geo-location/i18n/
msgid "gluon-config-mode:geo-location-help"
msgstr ""
# Leave empty to use the default text, which can be found in:
# package/gluon-config-mode-contact-info/i18n/
msgid "gluon-config-mode:contact-help"
msgstr ""
msgid "gluon-config-mode:contact-note"
msgstr ""

70
i18n/fr.po Normal file
View File

@@ -0,0 +1,70 @@
msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: PACKAGE VERSION\n"
"PO-Revision-Date: 2018-08-01 20:08+0100\n"
"Last-Translator: Matthias Kesler <krombel@krombel.de>\n"
"Language-Team: French\n"
"Language: fr\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 ""
"Bienvenue dans l'assistant de configuration pour votre nouveau nœud "
"Freifunk. Remplissez le formulaire suivant en fonction de vos besoins "
"et enregistrez le"
msgid "gluon-config-mode:domain"
msgstr "Domaine"
msgid "gluon-config-mode:domain-select"
msgstr ""
msgid "gluon-config-mode:pubkey"
msgstr ""
" "
msgid "gluon-config-mode:novpn"
msgstr ""
"<p>Vous avez choisi de <strong>ne pas utiliser</strong> "
"le réseau VPN. Votre nœud ne pourra se connecter au réseau Freifunk que si "
"d'autres nœuds à portée ont déjà une connexion.</p>"
msgid "gluon-config-mode:reboot"
msgstr ""
"<p>Votre nœud <em><%= pcdata(hostname) %></em> es en train de redémarrer et "
"va ensuite éssayer de se connecter avec les autres nœuds du réseau Freifunk "
"Vous pourrez trouver plus d'informations sur votre groupe Freifunk sur la page "
"<a href=\"https://ffmuc.net/\"> de ton groupe </a>.</p> "
"<p> Pour retrouver cette page de configuration veuillier appuyez pendant le "
"fonctionement normal pendant 3 Secondes sur le bouton reset. L'appareil va ensuite "
"redémarer en mode configuration.</p> "
"<p>Profitez votre de nœud et amusez vous à découvrir le réseau Freifunk!</p>"
msgid "gluon-config-mode:altitude-label"
msgstr "Hauteur"
msgid "gluon-config-mode:altitude-help"
msgstr ""
"La altitude est optionelle et ne devrait que être ajoutée si la valeur "
"exacte est connue."
# Leave empty to use the default text, which can be found in:
# package/gluon-config-mode-hostname/i18n/
msgid "gluon-config-mode:hostname-help"
msgstr ""
# Leave empty to use the default text, which can be found in:
# package/gluon-config-mode-geo-location/i18n/
msgid "gluon-config-mode:geo-location-help"
msgstr ""
# Leave empty to use the default text, which can be found in:
# package/gluon-config-mode-contact-info/i18n/
msgid "gluon-config-mode:contact-help"
msgstr ""
msgid "gluon-config-mode:contact-note"
msgstr ""

38
i18n/gluon-site.pot Normal file
View File

@@ -0,0 +1,38 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8"
msgid "gluon-config-mode:welcome"
msgstr ""
msgid "gluon-config-mode:domain"
msgstr ""
msgid "gluon-config-mode:domain-select"
msgstr ""
msgid "gluon-config-mode:pubkey"
msgstr ""
msgid "gluon-config-mode:novpn"
msgstr ""
msgid "gluon-config-mode:reboot"
msgstr ""
msgid "gluon-config-mode:altitude-label"
msgstr ""
msgid "gluon-config-mode:altitude-help"
msgstr ""
msgid "gluon-config-mode:contact-help"
msgstr ""
msgid "gluon-config-mode:contact-note"
msgstr ""
msgid "gluon-config-mode:hostname-help"
msgstr ""
msgid "gluon-config-mode:geo-location-help"
msgstr ""

6
site.conf
View File

@@ -1,5 +1,5 @@
{
hostname_prefix = '',
hostname_prefix = 'ffmuc-',
site_name = 'Freifunk München [ALT]',
site_code = 'ffmuc',
@@ -9,6 +9,10 @@
},
},
-- 32 bytes of random data, encoded in hexadecimal
-- This data must be unique among all sites and domains!
domain_seed = '8f6cb3915d9cff8e556a88ee9326349b23a251e056465afbd9f5e5c01c86c7c7',
prefix4 = '10.80.32.0/19',
prefix6 = 'fdef:ffc0:4fff::/64',

45
site.mk
View File

@@ -1,29 +1,26 @@
GLUON_FEATURES := \
respondd \
autoupdater \
web-wizard \
ebtables-filter-multicast \
ebtables-filter-ra-dhcp \
web-admin \
web-autoupdater \
web-network \
web-wifi-config \
mesh-batman-adv-15 \
mesh-vpn-fastd \
radvd \
setup-mode \
status-page \
config-mode-site-select \
ebtables-filter-arp-ffmuc \
ebtables-filter-multicast-ffmuc
GLUON_SITE_PACKAGES := \
gluon-respondd \
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-web-admin \
gluon-web-autoupdater \
gluon-web-network \
gluon-web-wifi-config \
gluon-mesh-batman-adv-15 \
gluon-mesh-vpn-fastd \
gluon-radvd \
gluon-setup-mode \
gluon-status-page \
iwinfo \
iptables \
haveged \
gluon-config-mode-site-select \
gluon-ebtables-filter-arp-ffmuc \
gluon-ebtables-filter-multicast-ffmuc \
tecff-ath9k-broken-wifi-workaround \
tecff-respondd-watchdog
@@ -173,7 +170,7 @@ GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
GLUON_PRIORITY ?= 0
GLUON_REGION ?= eu
# Languages to include
GLUON_LANGS ?= en de
GLUON_REGION := eu