diff --git a/i18n/de.po b/i18n/de.po
new file mode 100644
index 0000000000000000000000000000000000000000..c0d0ae10c560513a02d1802691dc8e1d4def9643
--- /dev/null
+++ b/i18n/de.po
@@ -0,0 +1,47 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2015-05-17 20:28+0100\n"
+"Last-Translator: Leonard Penzer <leonard@penzer.de>\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 Freifunk-Knoten."
+"Fülle das folgende Formular deinen Vorstellung entsprechend aus und sende es ab. "
+"Wenn Du Koordinaten für für die Eintragung auf der Karte benötigst, "
+"kannst Du unsere <a href=\"http://gw01.freifunk-stuttgart.de/map\" target=\"_blank\">Karte</a> verwenden."
+
+msgid "gluon-config-mode:pubkey"
+msgstr ""
+"Dies ist der öffentliche Schlüssel deines Freifunk-Knotens. Erst nachdem er auf "
+"den Servern des Stuttgarter Freifunk-Projektes eingetragen wurde "
+"kann sich dein Knoten mit den Mesh-VPNs in Stuttgart verbinden. "
+"Bitte schicke dazu diesen Schlüssel und den Namen deines Knotens (<em><%=hostname%></em>) "
+"an <a href=\"mailto:vpn-schluessel@lists.freifunk-stuttgart.net?&subject=Neuer%20Freifunk-Knoten%3A%20<%=hostname%>&body=Name%3A%20<%=hostname%>%0D%0AKey%3A%20<%=pubkey%>%0D%0AMAC%3A%20<%=sysconfig.primary_mac%>%0D%0A\">vpn-schluessel@lists.freifunk-stuttgart.net</a>. "
+"<small>Ein Klick auf den E-Mail Link müsste™ dein E-Mail Programm "
+"öffnen und alle benötigten Informationen in eine neue Mail einfügen.</small>"
+
+msgid "gluon-config-mode:reboot"
+msgstr ""
+"Dein Knoten startet gerade neu und wird anschließend versuchen, sich mit anderen "
+"Freifunk-Knoten in seiner Nähe zu verbinden. "
+"<h2>Und was jetzt?</h2>"
+"Weitere Informationen zur Freifunk-Community findest du auf den Webseiten von "
+"<a href=\"http://www.freifunk-suttgart.de/\">Freifunk Stuttgart</a> oder unter <a href=\"http://www.freifunk.net/\">freifunk.net</a>. "
+"<dl> "
+" <dt>Karte</dt> "
+" <dd>Die Karten sind unter <a href=\"http://gw01.freifunk-stuttgart.de/map/\">gw01.freifunk-stuttgart.de/map</a> erreichbar.</dd> "
+" <dt>Next Node</dt> "
+" <dd>Den Router mit dem man momentan verbunden ist, kann man immer unter der sogenannten Next Node Adresse erreichen. Diese ist für jeden Router gleich:</dd> "
+" <dd>• Stuttgart — <a href=\"http://[fd21:b4dc:4b1e::1]/\">fd21:b4dc:4b1e::1</a> – <a href=\"http://172.21.24.254/\">172.21.24.254</a></dd> "
+"</dl> "
+"Viel Spaß mit deinem Knoten und bei der Erkundung von Freifunk!<br /> "
+"<small>Hilf uns weitere Anleitungen, Texte, Grafiken, Applikationen, Schaubilder, und ähnliches zu erstellen die wir hier verlinken können, um jedem neuen Freifunker einen guten Start zu ermöglichen</small>"
+
+
diff --git a/i18n/en.po b/i18n/en.po
new file mode 100644
index 0000000000000000000000000000000000000000..10047ddcf04e23a5a1a5f68f11e5227b1942acd6
--- /dev/null
+++ b/i18n/en.po
@@ -0,0 +1,38 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2015-05-19 20:28+0100\n"
+"Last-Translator: Leonard Penzer <leonard@penzer.de>\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 of your new Freifunk Stuttgart node. "
+"Please fill out the following form and transmit it."
+"If you need location data, "
+"you can use our <a href=\"http://gw01.freifunk-stuttgart.de/map\" target=\"_blank\">Map</a>."
+
+
+msgid "gluon-config-mode:pubkey"
+msgstr ""
+"This is your Freifunk node's public key. The node won't be able to "
+"connect to the mesh VPN until the key has been registered on the Freifunk "
+"Stuttgart servers. "
+"To register the key send it together with your node's name (<em><%=hostname%></em>) to "
+"<a href=\"mailto:vpn-schluessel@lists.freifunk-stuttgart.net?&subject=Neuer%20Freifunk-Knoten%3A%20<%=hostname%>&body=Name%3A%20<%=hostname%>%0D%0AKey%3A%20<%=pubkey%>%0D%0AMAC%3A%20<%=sysconfig.primary_mac%>%0D%0A\">vpn-schluessel@lists.freifunk-stuttgart.net</a>. "
+
+msgid "gluon-config-mode:reboot"
+msgstr ""
+"<p>The node is currently rebooting and will try to connect to other "
+"nearby Freifunk nodes after that. "
+"Your can find lots of information on the Freifunk Stuttgart community on "
+"<a href=\"http://www.freifunk-stuttgart.de/\">our homepage</a>.</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>"
diff --git a/i18n/gluon-site.pot b/i18n/gluon-site.pot
new file mode 100644
index 0000000000000000000000000000000000000000..670de4107f99ccdc03c2faf70ed7bb3487f1ef01
--- /dev/null
+++ b/i18n/gluon-site.pot
@@ -0,0 +1,11 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "gluon-config-mode:welcome"
+msgstr ""
+
+msgid "gluon-config-mode:pubkey"
+msgstr ""
+
+msgid "gluon-config-mode:reboot"
+msgstr ""
diff --git a/site.conf b/site.conf
index 47182bc1c9546a5181dbd0827c18f903dff1e643..e0e46447e611b15c6ec0b84a8870ffb9b546717f 100644
--- a/site.conf
+++ b/site.conf
@@ -40,51 +40,53 @@
methods = {'salsa2012+umac'},
mtu = 1406,
enabled = true,
- backbone = {
- limit = 2,
- peers = {
- gw01 = {
- key = 'd7b89d42b629bd5d419139b4c395e7b47ed7417112d3fcd232ba38137daa58e6',
- remotes = {'"gw01.freifunk-stuttgart.de" port 10037'},
- },
- gw02 = {
- key = 'b694b4646f4fa7cb027f3786993c6c8b9062d1357fa7257bd3210706cffc565a',
- remotes = {'"gw02.freifunk-stuttgart.de" port 10037'},
- },
- gw03 = {
- key = '1e944f5f2dca02e1c1d2e006186417e76759c26f75da5e7850f6c1e5cddcb1c2',
- remotes = {'"gw03.freifunk-stuttgart.de" port 10037'},
- },
- gw04 = {
- key = '5689b2fd14bd313de1e95406c17e783b78b9d6f8aa86f896df4f2d843ab642bf',
- remotes = {'"gw04.freifunk-stuttgart.de" port 10037'},
- },
- gw05 = {
- key = '26cd067057e4fcf58fb68da66c75a360de56aa4c36094f1846f706824682a789',
- remotes = {'"gw05.freifunk-stuttgart.de" port 10037'},
- },
- gw06 = {
- key = 'fdc1737906d7431763962f4daf6eb4d973c845aca7a96e40643d08a82159dff2',
- remotes = {'"gw06.freifunk-stuttgart.de" port 10037'},
- },
- gw07 = {
- key = '23f6d70be861effe9b1a7bc812fd8c9e2e575bf0ea63ca4ffdc0a3998afb59a1',
- remotes = {'"gw07.freifunk-stuttgart.de" port 10037'},
- },
- gw08 = {
- key = '1af6a5d41d866823e5712e8d9af42080397ad52bdd8664a11ca94225629398a3',
- remotes = {'"gw08.freifunk-stuttgart.de" port 10037'},
- },
- gw09 = {
- key = 'bf7c1a62dbf61b8fda25be7e5e600c0ae745e6b6e90a419aeafaf85b6497e8f2',
- remotes = {'"gw09.freifunk-stuttgart.de" port 10037'},
- },
- gw10 = {
- key = '4b89e1a8882b4d7cf50eabc0360ff28138d78ca0b63fd63ec9e4c8260121da00',
- remotes = {'"gw10.freifunk-stuttgart.de" port 10037'},
- },
- },
- },
+ groups = {
+ backbone = {
+ limit = 2,
+ peers = {
+ gw01 = {
+ key = 'd7b89d42b629bd5d419139b4c395e7b47ed7417112d3fcd232ba38137daa58e6',
+ remotes = {'"gw01.freifunk-stuttgart.de" port 10037'},
+ },
+ gw02 = {
+ key = 'b694b4646f4fa7cb027f3786993c6c8b9062d1357fa7257bd3210706cffc565a',
+ remotes = {'"gw02.freifunk-stuttgart.de" port 10037'},
+ },
+ gw03 = {
+ key = '1e944f5f2dca02e1c1d2e006186417e76759c26f75da5e7850f6c1e5cddcb1c2',
+ remotes = {'"gw03.freifunk-stuttgart.de" port 10037'},
+ },
+ gw04 = {
+ key = '5689b2fd14bd313de1e95406c17e783b78b9d6f8aa86f896df4f2d843ab642bf',
+ remotes = {'"gw04.freifunk-stuttgart.de" port 10037'},
+ },
+ gw05 = {
+ key = '26cd067057e4fcf58fb68da66c75a360de56aa4c36094f1846f706824682a789',
+ remotes = {'"gw05.freifunk-stuttgart.de" port 10037'},
+ },
+ gw06 = {
+ key = 'fdc1737906d7431763962f4daf6eb4d973c845aca7a96e40643d08a82159dff2',
+ remotes = {'"gw06.freifunk-stuttgart.de" port 10037'},
+ },
+ gw07 = {
+ key = '23f6d70be861effe9b1a7bc812fd8c9e2e575bf0ea63ca4ffdc0a3998afb59a1',
+ remotes = {'"gw07.freifunk-stuttgart.de" port 10037'},
+ },
+ gw08 = {
+ key = '1af6a5d41d866823e5712e8d9af42080397ad52bdd8664a11ca94225629398a3',
+ remotes = {'"gw08.freifunk-stuttgart.de" port 10037'},
+ },
+ gw09 = {
+ key = 'bf7c1a62dbf61b8fda25be7e5e600c0ae745e6b6e90a419aeafaf85b6497e8f2',
+ remotes = {'"gw09.freifunk-stuttgart.de" port 10037'},
+ },
+ gw10 = {
+ key = '4b89e1a8882b4d7cf50eabc0360ff28138d78ca0b63fd63ec9e4c8260121da00',
+ remotes = {'"gw10.freifunk-stuttgart.de" port 10037'},
+ },
+ },
+ },
+ },
},
autoupdater = {
@@ -96,9 +98,11 @@
mirrors = {
'http://[fd21:b4dc:4b1e::a38:1]/gluon/stable/sysupgrade', -- gluongw
},
- good_signatures = 1,
+ good_signatures = 2,
pubkeys = {
'4418436fe872b5746a6c86293afca7c6c9edba03eca3cac80fdfd82106092d7a', -- leonard
+ '0b43680e4c389a55a02663a740be234defe017c1e05ba49de87baaa1f88c66c1', -- are
+ 'b7077095e9d3fc892db1c280b78b65d737700c9aea70a6998d6aad8b3146aaed', -- flip
},
},
beta = {
@@ -109,6 +113,8 @@
good_signatures = 1,
pubkeys = {
'4418436fe872b5746a6c86293afca7c6c9edba03eca3cac80fdfd82106092d7a', -- leonard
+ '0b43680e4c389a55a02663a740be234defe017c1e05ba49de87baaa1f88c66c1', -- are
+ 'b7077095e9d3fc892db1c280b78b65d737700c9aea70a6998d6aad8b3146aaed', -- flip
},
},
nightly = {
@@ -119,6 +125,8 @@
good_signatures = 1,
pubkeys = {
'4418436fe872b5746a6c86293afca7c6c9edba03eca3cac80fdfd82106092d7a', -- leonard
+ '0b43680e4c389a55a02663a740be234defe017c1e05ba49de87baaa1f88c66c1', -- are
+ 'b7077095e9d3fc892db1c280b78b65d737700c9aea70a6998d6aad8b3146aaed', -- flip
},
},
},
diff --git a/site.mk b/site.mk
index a53a329a942eeda8e3bfa3bc9123bd6ad7c855f3..4e50802adcbca73dbca5fb49404cff34909d22c1 100644
--- a/site.mk
+++ b/site.mk
@@ -5,6 +5,7 @@ GLUON_SITE_PACKAGES := \
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 \
@@ -14,16 +15,21 @@ GLUON_SITE_PACKAGES := \
gluon-luci-autoupdater \
gluon-luci-portconfig \
gluon-luci-private-wifi \
+ gluon-luci-wifi-config \
gluon-neighbour-info \
gluon-next-node \
gluon-mesh-vpn-fastd \
gluon-radvd \
+ gluon-setup-mode \
gluon-status-page \
haveged \
iptables \
iwinfo
-DEFAULT_GLUON_RELEASE := 0.3+0-$(shell date '+%Y.%m.%d-%H.%M')-g.$(shell git -C $(GLUONDIR) log --pretty=format:'%h' -n 1)-s.$(shell git -C $(GLUONDIR)/site log --pretty=format:'%h' -n 1)
+
+DEFAULT_GLUON_RELEASE := 0.4+0-$(shell date '+%Y.%m.%d-%H.%M')-g.$(shell git -C $(GLUONDIR) log --pretty=format:'%h' -n 1)-s.$(shell git -C $(GLUONDIR)/site log --pretty=format:'%h' -n 1)
+
+GLUON_LANGS := de en
# Allow overriding the release number from the command line
GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)