Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

disable ffuplink-interface during initial setup #185

Merged
merged 7 commits into from
Jan 27, 2021
Merged

disable ffuplink-interface during initial setup #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
29cda0a
network-defaults: disable ffuplink by default
SvenRoederer Jan 6, 2019
a548568
uplinks: enable ffuplink interface after setup
SvenRoederer Jan 6, 2019
1aebe45
ffwizard: enable the ffuplink interface when sharenet is selected
pmelange Jun 14, 2019
57cf702
Revert "ffwizard: enable the ffuplink interface when sharenet is sele…
SvenRoederer Dec 30, 2019
51a68a5
ffwizard: enable ffuplink-interface when "share-internet" was selected
SvenRoederer Dec 30, 2019
61eee94
Revert "uplinks: enable ffuplink interface after setup"
SvenRoederer Dec 30, 2019
decc736
network-defaults: revert version-bump
SvenRoederer Dec 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions defaults/freifunk-berlin-network-defaults/uci-defaults/freifunk-berlin-ffuplink-defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ uci set ffberlin-uplink.uplink.auth=none
uci commit ffberlin-uplink

create_ffuplink
uci set network.ffuplink.disabled=1
uci commit network.ffuplink
2 changes: 2 additions & 0 deletions utils/luci-app-ffwizard-berlin/luasrc/model/cbi/freifunk/assistent/shareInternet.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ function main.write(self, section, value)
uci:set("ffwizard", "settings", "sharenet", 1)
uci:set("ffwizard", "settings", "usersBandwidthUp", usersBandwidthUp:formvalue(section))
uci:set("ffwizard", "settings", "usersBandwidthDown", usersBandwidthDown:formvalue(section))
uci:set("network", "ffuplink", "disabled", "0")

uci:section("openvpn", "openvpn", "ffuplink", {
--persist_tun='0',
Expand All @@ -82,6 +83,7 @@ function main.write(self, section, value)

uci:save("openvpn")
uci:save("ffwizard")
uci:save("network","ffuplink")

-- I need to commit this here, don't know why I can not do this in apply changes
uci:commit("openvpn")
Expand Down