freifunk/ffhh-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Pull new upstream changes

Browse source 
based on freifunk-gluon/packages@48b26ad13e
This commit is contained in:
ohrensessel 2014-07-11 00:30:55 +02:00
commit cc08450972
13 changed files with 17 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gluon-config-mode-ffhh/files/usr/lib/lua/luci/controller/gluon-config-mode/index.lua
View file

@ -21,7 +21,7 @@ local meshvpn_name = "mesh_vpn"
function index()
local uci_state = luci.model.uci.cursor_state()
if uci_state:get_first("gluon-config-mode", "wizard", "running", "0") == "1" then
if uci_state:get_first("gluon-setup-mode", "setup_mode", "running", "0") == "1" then
local root = node()
if not root.target then
root.target = alias("gluon-config-mode")
@ -57,9 +57,9 @@ function action_reboot()
pubkey = configmode.get_fastd_pubkey(meshvpn_name)
end
uci:set("gluon-config-mode", uci:get_first("gluon-config-mode", "wizard"), "configured", "1")
uci:save("gluon-config-mode")
uci:commit("gluon-config-mode")
uci:set("gluon-setup-mode", uci:get_first("gluon-setup-mode", "setup_mode"), "configured", "1")
uci:save("gluon-setup-mode")
uci:commit("gluon-setup-mode")
local hostname = uci:get_first("system", "system", "hostname")

3
gluon-config-mode-ffhh/files/usr/lib/lua/luci/model/cbi/gluon-config-mode/wizard.lua
View file

@ -30,7 +30,8 @@ o.datatype = "hostname"
s = f:section(SimpleSection, nil, [[Falls du deinen Knoten über das Internet
mit Freifunk verbinden möchtest, kannst du hier das Mesh-VPN aktivieren.
Solltest du dich dafür entscheiden, hast du die Möglichkeit die dafür
genutzte Bandbreite zu beschränken.]])
genutzte Bandbreite zu beschränken. Lässt du das Mesh-VPN deaktiviert,
verbindet sich dein Knoten nur per WLAN mit anderen Knoten in der Nähe.]])
o = s:option(Flag, "_meshvpn", "Mesh-VPN aktivieren")
o.default = uci:get_bool("fastd", meshvpn_name, "enabled") and o.enabled or o.disabled