From: Stan Grishin <stangri@melmac.net>
Date: Fri, 26 Jan 2018 02:30:20 +0000 (-0800)
Subject: luci-app-vpnbypass: better service start/stop
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=1fd24f3fd8836287a418a8f09adc3f0dec04a9d2;p=project%2Fluci.git

luci-app-vpnbypass: better service start/stop

Signed-off-by: Stan Grishin <stangri@melmac.net>
---

diff --git a/applications/luci-app-vpnbypass/Makefile b/applications/luci-app-vpnbypass/Makefile
index 0ca74ae38a..838840e6b0 100644
--- a/applications/luci-app-vpnbypass/Makefile
+++ b/applications/luci-app-vpnbypass/Makefile
@@ -7,9 +7,10 @@ PKG_LICENSE:=GPL-3.0+
 PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net>
 
 LUCI_TITLE:=VPN Bypass Web UI
-LUCI_DEPENDS:=+vpnbypass
+LUCI_DESCRIPTION:=Provides Web UI for VPNBypass service.
+LUCI_DEPENDS:=+luci +vpnbypass
 LUCI_PKGARCH:=all
-PKG_RELEASE:=1
+PKG_RELEASE:=3
 
 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 bb27b63818..9d2f5f425c 100644
--- a/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua
+++ b/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua
@@ -4,19 +4,11 @@ m = Map("vpnbypass", translate("VPN Bypass Settings"))
 s = m:section(NamedSection, "config", "vpnbypass")
 
 -- General options
-e = s:option(Flag, "enabled", translate("Enable/start service"))
+e = s:option(Flag, "enabled", translate("Start VPNBypass service"))
 e.rmempty = false
-
-function e.cfgvalue(self, section)
-	return self.map:get(section, "enabled") == "1" and luci.sys.init.enabled("vpnbypass") and self.enabled or self.disabled
-end
-
 function e.write(self, section, value)
-	if value == "1" then
-		luci.sys.call("/etc/init.d/vpnbypass enable >/dev/null")
-		luci.sys.call("/etc/init.d/vpnbypass start >/dev/null")
-	else
-		luci.sys.call("/etc/init.d/vpnbypass stop >/dev/null")
+	if value ~= "1" then
+		luci.sys.init.stop("vpnbypass")
 	end
 	return Flag.write(self, section, value)
 end
diff --git a/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot b/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot
index fd92b5e8a8..c14c02fe9f 100644
--- a/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot
+++ b/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot
@@ -7,9 +7,6 @@ msgstr ""
 msgid "Domains to be accessed directly (outside of the VPN tunnel), see"
 msgstr ""
 
-msgid "Enable/start service"
-msgstr ""
-
 msgid "Local IP Addresses to Bypass"
 msgstr ""
 
@@ -41,6 +38,9 @@ msgstr ""
 msgid "Remote ports to trigger VPN Bypass"
 msgstr ""
 
+msgid "Start VPNBypass service"
+msgstr ""
+
 msgid "VPN Bypass"
 msgstr ""