diff --git a/README b/README
index a292fa8..403d77e 100644
--- a/README
+++ b/README
@@ -1,5 +1,13 @@
Gluon versions used for specific Lübeck Freifunk Firmware builds:
+* 0.8.4: v2016.1.5
+* 0.8.3: v2016.1.5
+* 0.8.2: v2016.1.4
+* 0.8.1: v2016.1.3
+* 0.8: v2016.1.2
+* 0.7.1: v2015.1.2
+* 0.7: v2015.1.1
+* 0.6: v2014.4
* 0.5: v2014.3
* 0.4.1: v2014.2
* 0.4: v2014.1
diff --git a/i18n/de.po b/i18n/de.po
new file mode 100644
index 0000000..2272add
--- /dev/null
+++ b/i18n/de.po
@@ -0,0 +1,40 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2015-03-19 20:28+0100\n"
+"Last-Translator: Matthias Schiffer <mschiffer@universe-factory.net>\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 Lübecker "
+"Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen "
+"entsprechend aus und sende es ab."
+
+msgid "gluon-config-mode:pubkey"
+msgstr ""
+"<p>Dies ist der öffentliche Schlüssel deines Freifunkknotens. Erst nachdem "
+"er auf den Servern des Lübecker Freifunk-Projektes eingetragen wurde, "
+"kann sich dein Knoten mit dem Lübecker Mesh-VPN verbinden. Bitte "
+"schicke dazu diesen Schlüssel und den Namen deines Knotens "
+"(<em><%=hostname%></em>) an "
+"<a href=\"mailto:keys@luebeck.freifunk.net\">keys@luebeck.freifunk.net</a>.</p>"
+"<div class=\"the-key\">"
+" # <%= 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 "
+"Lübecker Freifunk-Community findest du auf "
+"<a href=\"https://luebeck.freifunk.net/\">unserer Webseite</a>.</p>"
+"<p>Viel Spaß mit deinem Knoten und bei der Erkundung von Freifunk!</p>"
diff --git a/i18n/en.po b/i18n/en.po
new file mode 100644
index 0000000..693e632
--- /dev/null
+++ b/i18n/en.po
@@ -0,0 +1,37 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2015-03-19 20:28+0100\n"
+"Last-Translator: Matthias Schiffer <mschiffer@universe-factory.net>\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 to the setup wizard of your new Freifunk Lübeck node. "
+"To join the network, please complete the following form and transmit it."
+
+msgid "gluon-config-mode:pubkey"
+msgstr ""
+"<p>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 "
+"Lübeck servers. "
+"To register the key send it together with your node's name (<em><%=hostname%></em>) to "
+"<a href=\"mailto:keys@luebeck.freifunk.net\">keys@luebeck.freifunk.net</a>.</p>"
+"<div class=\"the-key\">"
+" # <%= hostname %>"
+" <br/>"
+"<%= pubkey %>"
+"</div>"
+
+msgid "gluon-config-mode:reboot"
+msgstr ""
+"<p>The node is currently rebooting and will then attempt to connect to other "
+"nearby Freifunk nodes after that. "
+"You can find lots of information on the Freifunk Lübeck community on "
+"<a href=\"https://luebeck.freifunk.net/\">our homepage</a>.</p>"
+"<p>Have fun with your node while exploring the Freifunk network!</p>"
diff --git a/site.conf b/site.conf
index 3633f1a..433d878 100644
--- a/site.conf
+++ b/site.conf
@@ -2,30 +2,52 @@
hostname_prefix = 'freifunk',
site_name = 'Freifunk Lübeck',
site_code = 'ffhl',
- opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07-rc3/%S/packages',
+
+ opkg = {
+ openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+ extra = {
+ modules = 'http://opkg.services.luebeck.freifunk.net/modules/gluon-%GS-%GR/%S',
+ },
+ },
prefix4 = '10.130.0.0/20',
prefix6 = 'fdef:ffc0:3dd7::/64',
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
- ntp_servers = {'1.ntp.services.ffhl'},
+ ntp_servers = {'1.ntp.services.luebeck.freifunk.net'},
regdom = 'DE',
wifi24 = {
- ssid = 'luebeck.freifunk.net',
channel = 1,
htmode = 'HT40+',
- mesh_ssid = '02:d1:11:37:fc:38',
- mesh_bssid = '02:d1:11:37:fc:38',
- mesh_mcast_rate = 12000,
+ ap = {
+ ssid = 'luebeck.freifunk.net',
+ },
+ ibss = {
+ ssid = '02:d1:11:37:fc:38',
+ bssid = '02:d1:11:37:fc:38',
+ mcast_rate = 12000,
+ },
+ --[[mesh = {
+ id = 'eseB6Qlu',
+ mcast_rate = 12000,
+ },--]]
},
wifi5 = {
- ssid = 'luebeck.freifunk.net',
channel = 44,
htmode = 'HT40+',
- mesh_ssid = '02:d1:11:37:fc:38',
- mesh_bssid = '02:d1:11:37:fc:38',
- mesh_mcast_rate = 12000,
+ ap = {
+ ssid = 'luebeck.freifunk.net',
+ },
+ ibss = {
+ ssid = '02:d1:11:37:fc:38',
+ bssid = '02:d1:11:37:fc:38',
+ mcast_rate = 12000,
+ },
+ --[[mesh = {
+ id = 'eseB6Qlu',
+ mcast_rate = 12000,
+ },--]]
},
next_node = {
@@ -36,29 +58,37 @@
},
fastd_mesh_vpn = {
- methods = {'salsa2012+gmac'},
- mtu = 1426,
- backbone = {
- limit = 2,
- peers = {
- burgtor = {
- key = '657af03e36ff1b8bbe5a5134982a4f110c8523a9a63293870caf548916a95a03',
- remotes = {'ipv4 "burgtor.mesh.ffhl.chaotikum.org" port 10000'},
- },
- holstentor = {
- key = '8c660f7511bf101ea1b599fe53af20e1146cd923c9e9d2a3a0d534ee75af9067',
- remotes = {'ipv4 "holstentor.mesh.ffhl.chaotikum.org" port 10000'},
- },
- huextertor = {
- key = 'a1b124f43eae4f5929850c09cda825ef35d659e3db4d7746e3d97627e9fa7238',
- remotes = {'ipv4 "huextertor.mesh.ffhl.chaotikum.org" port 10000'},
- },
- muehlentor = {
- key = 'bd4ec3cf87bb0042eed2fa121fbc402154d28fb1ae9dff9cdb71bb21892f401a',
- remotes = {'ipv4 "muehlentor.mesh.ffhl.chaotikum.org" port 10000'},
+ configurable = true,
+ methods = {'salsa2012+umac'},
+ mtu = 1280,
+ groups = {
+ backbone = {
+ limit = 1,
+ peers = {
+ huextertor = {
+ key = 'a1b124f43eae4f5929850c09cda825ef35d659e3db4d7746e3d97627e9fa7238',
+ remotes = {'"huextertor.mesh.ffhl.chaotikum.org" port 10002'},
+ },
+ muehlentor = {
+ key = 'bd4ec3cf87bb0042eed2fa121fbc402154d28fb1ae9dff9cdb71bb21892f401a',
+ remotes = {'"muehlentor.mesh.ffhl.chaotikum.org" port 10002'},
+ },
+ burgtor = {
+ key = '657af03e36ff1b8bbe5a5134982a4f110c8523a9a63293870caf548916a95a03',
+ remotes = {'"burgtor.mesh.ffhl.chaotikum.org" port 10002'},
+ },
+ holstentor = {
+ key = '8c660f7511bf101ea1b599fe53af20e1146cd923c9e9d2a3a0d534ee75af9067',
+ remotes = {'"holstentor.mesh.ffhl.chaotikum.org" port 10002'},
+ },
},
},
},
+ bandwidth_limit = {
+ enabled = false,
+ ingress = 3000,
+ egress = 200,
+ },
},
autoupdater = {
@@ -66,27 +96,29 @@
branches = {
stable = {
name = 'stable',
- mirrors = {'http://1.updates.services.ffhl/stable/sysupgrade'},
+ mirrors = {'http://1.updates.services.luebeck.freifunk.net/stable/sysupgrade'},
good_signatures = 2,
pubkeys = {
'daa19b44bbd7033965e02088127bad9516ba0fea8f34267a777144a23ec8900c', -- Linus
'a8dd60765b07330a4bbfdf8406102befca132881a4b65f3efda32cf2d5b362d9', -- Nils
'323bd3285c4e5547a89cd6da1f2aef67f1654b0928bbd5b104efc9dab2156d0b', -- NeoRaider
+ 'fb1790fb4500f0cb94d3bc5b32c28651c83c6415b846d69699cdaeea3385a618', -- Kaspar
},
},
beta = {
name = 'beta',
- mirrors = {'http://1.updates.services.ffhl/beta/sysupgrade'},
+ mirrors = {'http://1.updates.services.luebeck.freifunk.net/beta/sysupgrade'},
good_signatures = 2,
pubkeys = {
'daa19b44bbd7033965e02088127bad9516ba0fea8f34267a777144a23ec8900c', -- Linus
'a8dd60765b07330a4bbfdf8406102befca132881a4b65f3efda32cf2d5b362d9', -- Nils
'323bd3285c4e5547a89cd6da1f2aef67f1654b0928bbd5b104efc9dab2156d0b', -- NeoRaider
+ 'fb1790fb4500f0cb94d3bc5b32c28651c83c6415b846d69699cdaeea3385a618', -- Kaspar
},
},
experimental = {
name = 'experimental',
- mirrors = {'http://1.updates.services.ffhl/experimental/sysupgrade'},
+ mirrors = {'http://1.updates.services.luebeck.freifunk.net/experimental/sysupgrade'},
good_signatures = 1,
pubkeys = {
'496136b37e5f561dfdf523611f14e4b6bc2a745cbc1ab7daffa59fded5f202d1', -- philae
@@ -95,43 +127,6 @@
},
},
- simple_tc = {
- mesh_vpn = {
- ifname = 'mesh-vpn',
- enabled = false,
- limit_egress = 200,
- limit_ingress = 3000,
- },
- },
-
- config_mode = {
- msg_welcome = [[
-Willkommen zum Einrichtungsassistenten für deinen neuen Lübecker
-Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen
-entsprechend aus und sende es ab.
-]],
- msg_pubkey = [[
-Dies ist der öffentliche Schlüssel deines Freifunkknotens. Erst nachdem
-er auf den Servern des Lübecker Freifunk-Projektes eingetragen wurde,
-kann sich dein Knoten mit dem Lübecker Mesh-VPN zu verbinden. Bitte
-schicke dazu diesen Schlüssel und den Namen deines Knotens
-(<em><%=hostname%></em>) an
-<a href="mailto:keys@luebeck.freifunk.net">keys@luebeck.freifunk.net</a>.
-]],
- 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
-Lübecker Freifunk-Community findest du auf
-<a href="https://luebeck.freifunk.net/">unserer Webseite</a>.
-</p>
-<p>
-Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!
-</p>
-]],
- },
-
legacy = {
version_files = {'/etc/.freifunk_version_keep', '/etc/.lff_version_keep'},
old_files = {'/etc/config/config_mode', '/etc/config/ffhl', '/etc/config/freifunk'},
diff --git a/site.mk b/site.mk
index 253b3c3..09d5b14 100644
--- a/site.mk
+++ b/site.mk
@@ -1,31 +1,37 @@
GLUON_SITE_PACKAGES := \
gluon-mesh-batman-adv-14 \
gluon-alfred \
- gluon-announced \
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-config-mode-geo-location \
- gluon-config-mode-contact-info \
gluon-ebtables-filter-multicast \
gluon-ebtables-filter-ra-dhcp \
gluon-legacy \
gluon-luci-admin \
gluon-luci-autoupdater \
+ gluon-luci-mesh-vpn-fastd \
gluon-luci-portconfig \
+ gluon-luci-wifi-config \
gluon-next-node \
gluon-mesh-vpn-fastd \
gluon-radvd \
+ gluon-respondd \
+ gluon-setup-mode \
gluon-status-page \
iwinfo \
iptables \
haveged
-DEFAULT_GLUON_RELEASE := 0.6~exp$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := 0.8.4
# Allow overriding the release number from the command line
GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
GLUON_PRIORITY ?= 0
+
+GLUON_LANGS ?= en de