summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStan Grishin <stangri@melmac.net>2019-10-18 07:14:16 -0700
committerStan Grishin <stangri@melmac.net>2019-10-18 07:14:16 -0700
commit94b8da9e4f441e4aff001c4dca5a1a26a18527c9 (patch)
treef90a6fd79345f12f680c9a041e27dbb83445e367
parentd5ffab23b65fc37719752d122e0d37b38f471870 (diff)
luci-app-vpnbypass: bugfix: properly restart dnsmasq
Signed-off-by: Stan Grishin <stangri@melmac.net>
-rw-r--r--applications/luci-app-vpnbypass/Makefile2
-rw-r--r--applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua7
2 files changed, 5 insertions, 4 deletions
diff --git a/applications/luci-app-vpnbypass/Makefile b/applications/luci-app-vpnbypass/Makefile
index 51c3dafa70..7c89090072 100644
--- a/applications/luci-app-vpnbypass/Makefile
+++ b/applications/luci-app-vpnbypass/Makefile
@@ -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
diff --git a/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua b/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua
index 75c681ec44..e3c5753f4c 100644
--- a/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua
+++ b/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua
@@ -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