Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3213 from stangri/18.06-luci-app-vpnbypass

Browse source 
[18.06] luci-app-vpnbypass: bugfix: properly restart dnsmasq
This commit is contained in:
Florian Eckert 2019-10-18 16:58:06 +02:00 committed by GitHub
commit 42c1228875
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/luci-app-vpnbypass/Makefile
View file

@ -10,7 +10,7 @@ LUCI_TITLE:=VPN Bypass Web UI
LUCI_DESCRIPTION:=Provides Web UI for VPNBypass service.
LUCI_DEPENDS:=+luci-mod-admin-full +vpnbypass
LUCI_PKGARCH:=all
PKG_RELEASE:=10
PKG_RELEASE:=11
include ../../luci.mk

7
applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua
View file

@ -8,6 +8,7 @@ local uci = require "luci.model.uci".cursor()
local sys = require "luci.sys"
local http = require "luci.http"
local dispatcher = require "luci.dispatcher"
local util = require "luci.util"
en = h:option(Button, "__toggle")
if enabledFlag ~= "1" then
en.title = translate("Service is disabled/stopped")
@ -31,9 +32,9 @@ function en.write()
sys.init.start(packageName)
end
if dispatcher.lookup("admin/vpn") then
http.redirect(dispatcher.build_url("admin/vpn/" .. packageName))
http.redirect(dispatcher.build_url("admin", "vpn", packageName))
else
http.redirect(dispatcher.build_url("admin/services/" .. packageName))
http.redirect(dispatcher.build_url("admin", "services", packageName))
end
end
@ -76,7 +77,7 @@ di = s4:option(DynamicList, "ipset", translate("Domains to Bypass"),
.. [[<a href="]] .. readmeURL .. [[#bypass-domains-formatsyntax" target="_blank">]]
.. translate("README") .. [[</a> ]] .. translate("for syntax"))
function d.on_after_commit(map)
sys.init.restart("dnsmasq")
util.exec("/etc/init.d/dnsmasq restart >/dev/null 2>&1")
end
return m, d