Commit afb703bc authored by oni's avatar oni

Merge 'beta'

parents a3c63863 c4742664
......@@ -24,6 +24,14 @@ msgstr ""
"trage diesen Schlüssel in dieses <a href=\"http://freifunk-bs.de/eintragen.html\">Formular</a> ein. "
"Die Eintragung ist einmalig, wenn du später den Namen, Koordinaten oder Kontakt änderst, "
"muss der Key nicht erneut eingetragen werden."
"</p>"
"<div class=\"the-key\">"
" # <%= hostname %>"
" # <%= contact %>"
" <br/>"
"<%= pubkey %>"
"</div>"
msgid "gluon-config-mode:reboot"
msgstr ""
......@@ -40,4 +48,4 @@ msgstr ""
"Um zu den Einstellungen zurück zu kommen, halte im Betrieb "
"die Reset-Taste des Routers gedrückt und lasse los, sobald "
"alle LEDs aufleuchten, etwa 10s. Der Router startet dann "
"in das Konfigurationsmenü."
"in das Konfigurationsmenü."
\ No newline at end of file
......@@ -23,6 +23,13 @@ msgstr ""
"To register the key please fill it into this <a href=\"http://freifunk-bs.de/eintragen.html\">form</a>. "
"You have to register the key only once, you do not have to redo this after you changed the coordinates, "
"name, or contact."
"</p>"
"<div class=\"the-key\">"
" # <%= hostname %>"
" # <%= contact %>"
" <br/>"
"<%= pubkey %>"
"</div>"
msgid "gluon-config-mode:reboot"
msgstr ""
......
GLUON_SITE_FEEDS='packages_ffbs packages_fffd'
PACKAGES_PACKAGES_FFBS_REPO=git://github.com/ffbs/packages-ffbs.git
PACKAGES_PACKAGES_FFBS_COMMIT=7dae79e41f7b486224d6ba9954f311c5173a0ca8
PACKAGES_PACKAGES_FFBS_COMMIT=78f0d833cafada9860c2483def357b9b9e9bb9c5
PACKAGES_PACKAGES_FFBS_BRANCH=experimental
PACKAGES_PACKAGES_FFFD_REPO=git://github.com/freifunk-fulda/fffd-packages.git
......
......@@ -13,21 +13,38 @@
wifi24 = {
channel = 1,
htmode = 'HT40+',
ssid = 'braunschweig.freifunk.net',
mesh_ssid = '02:d1:11:37:fc:38',
mesh_bssid = '02:d1:11:37:fc:38',
mesh_mcast_rate = 12000,
ap = {
ssid = 'braunschweig.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,
},--]]
aliases = {
'Freifunk',
}
},
wifi5 = {
channel = 44,
htmode = 'HT40+',
ssid = 'braunschweig.freifunk.net (5GHz)',
mesh_ssid = '02:d1:11:37:fc:38',
mesh_bssid = '02:d1:11:37:fc:38',
mesh_mcast_rate = 12000,
ap = {
ssid = 'braunschweig.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,
},--]]
aliases = {
'Freifunk',
}
......@@ -48,11 +65,15 @@
backbone = {
limit = 1,
peers = {
gw04 = {
key = '8e6a913db1b5361f86af26c14c060e70b283eddccd006e768c14413b445bd650',
remotes = {'ipv4 "gw04.freifunk-bs.de" port 10001'},
},
gw03 = {
key = '872cac3b00096a8ee763e80df2be331ba1ffa5dbe00d1e025a85d25c3cee82fb',
remotes = {'ipv4 "gw03.freifunk-bs.de" port 10001'},
},
unicorn = {
gw02 = {
key = '1b3d401d841a1496970f1f7abc6fe21c01bfdc6cf391835d91a6798250ea8faf',
remotes = {'ipv4 "gw02.freifunk-bs.de" port 10000'},
......@@ -64,10 +85,15 @@
},
},
},
bandwidth_limit = {
enabled = false,
ingress = 3000,
egress = 200,
},
},
autoupdater = {
branch = 'stable',
branch = 'beta',
branches = {
stable = {
name = 'stable',
......@@ -78,6 +104,15 @@
'4efefc817e93fed2df1176f07621f432d088ef1f534bf455195b363870278bb1', -- jenkins
},
},
unbranded_stable = {
name = 'unbranded_stable',
mirrors = {'http://firmware.freifunk-bs.de/unbranded_stable/sysupgrade'},
good_signatures = 1,
pubkeys = {
'24e810335660d4b4e6da8d115dfa8e4283c931a5da5b337391311f14ef7fe445', -- oni
'4efefc817e93fed2df1176f07621f432d088ef1f534bf455195b363870278bb1', -- jenkins
},
},
beta = {
name = 'beta',
mirrors = {'http://firmware.freifunk-bs.de/beta/sysupgrade'},
......
GLUON_SITE_PACKAGES := \
gluon-mesh-batman-adv-14 \
gluon-alfred \
gluon-announced \
gluon-respondd \
gluon-autoupdater \
gluon-config-mode-autoupdater \
gluon-config-mode-contact-info-bs \
......@@ -20,10 +20,11 @@ GLUON_SITE_PACKAGES := \
gluon-mesh-vpn-fastd \
gluon-radvd \
gluon-setup-mode \
gluon-status-page \
gluon-status-page-bs \
iwinfo \
iptables \
gluon-fffd-wifi-aliases\
gluon-luci-private-wifi\
haveged
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment