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/depull/1/head v0.7.1
bdobe
parent
fce06e2ad7
commit
9fce915074
|
|
@ -1,5 +1,5 @@
|
|||
#### How to build the Freifunk Helgoland Firmware
|
||||
|
||||
|
||||
git clone https://github.com/freifunk-gluon/gluon.git # Get the official Gluon repository
|
||||
cd gluon
|
||||
git clone https://github.com/freifunk-helgoland/site-helgo.git site # Get the Freifunk Helgoland site repository
|
||||
|
|
@ -11,5 +11,6 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
|
|||
|
||||
#### Gluon versions used for specific Helgoland Freifunk Firmware builds
|
||||
|
||||
- 0.6: v2014.4
|
||||
|
||||
- 0.7.1: v2015.1.1
|
||||
- 0.7: skipped
|
||||
- 0.6: v2014.4
|
||||
|
|
|
|||
|
|
@ -0,0 +1,42 @@
|
|||
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 helgoland.freifunk.net."
|
||||
|
||||
msgid "gluon-config-mode:pubkey"
|
||||
msgstr ""
|
||||
"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."
|
||||
|
||||
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 ""
|
||||
"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."
|
||||
|
|
@ -0,0 +1,44 @@
|
|||
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 helgoland.freifunk.net."
|
||||
|
||||
msgid "gluon-config-mode:pubkey"
|
||||
msgstr ""
|
||||
"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 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>."
|
||||
|
||||
|
||||
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 ""
|
||||
"Please enter the name of your node "
|
||||
"(<em><%=hostname%></em>) and some additional information at "
|
||||
"<a href=\"http://formular.helgoland.freifunk.net/#/new?hostname=<%=hostname%>&mac=<%= sysconfig.primary_mac %>\" target=\"_blank\">http://formular.helgoland.freifunk.net/</a> "
|
||||
"."
|
||||
2
modules
2
modules
|
|
@ -1,4 +1,4 @@
|
|||
GLUON_SITE_FEEDS='ffhh_packages'
|
||||
|
||||
PACKAGES_FFHH_PACKAGES_REPO=git://github.com/freifunkhamburg/ffhh-packages.git
|
||||
PACKAGES_FFHH_PACKAGES_COMMIT=918d892f15aaf82417b642dc8cd87993bde9d7d6
|
||||
PACKAGES_FFHH_PACKAGES_COMMIT=818765060bc76a109dde1558513fd086e5973ef1
|
||||
|
|
|
|||
91
site.conf
91
site.conf
|
|
@ -38,24 +38,26 @@
|
|||
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'},
|
||||
groups = {
|
||||
backbone = {
|
||||
limit = 1,
|
||||
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'},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
@ -75,15 +77,15 @@
|
|||
},
|
||||
},
|
||||
beta = {
|
||||
name = 'beta',
|
||||
mirrors = {'http://1.updates.services.helgo/beta/sysupgrade','http://2.updates.services.helgo/beta/sysupgrade'},
|
||||
good_signatures = 2,
|
||||
pubkeys = {
|
||||
name = 'beta',
|
||||
mirrors = {'http://1.updates.services.helgo/beta/sysupgrade','http://2.updates.services.helgo/beta/sysupgrade'},
|
||||
good_signatures = 2,
|
||||
pubkeys = {
|
||||
'aee22cdc38b5d792cfc360d11030953ddaea65ad52e7a9a3879e2aa7e2bf9e8b', -- A.Bernhardt
|
||||
'874a73fab024e3dea99ef4b843ace2b97910fddde9911ce308b1d52add236270', -- bdobe
|
||||
'76911ba14827d95bf4721297f2f421a697824cc14026e42316f18b392bacc11c', -- Entil\'Zha
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
experimental = {
|
||||
name = 'experimental',
|
||||
mirrors = {'http://1.updates.services.helgo/experimental/sysupgrade','http://2.updates.services.helgo/experimental/sysupgrade'},
|
||||
|
|
@ -99,45 +101,8 @@
|
|||
mesh_vpn = {
|
||||
ifname = 'mesh-vpn',
|
||||
enabled = false,
|
||||
limit_egress = 500,
|
||||
limit_ingress = 8000,
|
||||
limit_egress = 768,
|
||||
limit_ingress = 8192,
|
||||
},
|
||||
},
|
||||
|
||||
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>
|
||||
]],
|
||||
},
|
||||
|
||||
}
|
||||
|
|
|
|||
6
site.mk
6
site.mk
|
|
@ -4,6 +4,7 @@ GLUON_SITE_PACKAGES := \
|
|||
gluon-announced \
|
||||
gluon-autoupdater \
|
||||
gluon-config-mode-autoupdater \
|
||||
gluon-config-mode-core \
|
||||
gluon-config-mode-hostname \
|
||||
gluon-config-mode-mesh-vpn \
|
||||
gluon-config-mode-reboot-ffhh \
|
||||
|
|
@ -16,6 +17,7 @@ GLUON_SITE_PACKAGES := \
|
|||
gluon-next-node \
|
||||
gluon-mesh-vpn-fastd \
|
||||
gluon-radvd \
|
||||
gluon-setup-mode \
|
||||
gluon-status-page \
|
||||
iwinfo \
|
||||
iptables \
|
||||
|
|
@ -23,7 +25,7 @@ GLUON_SITE_PACKAGES := \
|
|||
|
||||
|
||||
|
||||
DEFAULT_GLUON_RELEASE := 0.6
|
||||
DEFAULT_GLUON_RELEASE := 0.7.1
|
||||
# for experimental firmware:
|
||||
# DEFAULT_GLUON_RELEASE := 0.6+exp$(shell date '+%Y%m%d')
|
||||
|
||||
|
|
@ -31,3 +33,5 @@ DEFAULT_GLUON_RELEASE := 0.6
|
|||
GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
|
||||
|
||||
GLUON_PRIORITY ?= 0
|
||||
|
||||
GLUON_LANGS ?= en de
|
||||
|
|
|
|||
Loading…
Reference in New Issue