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

Merge pull request #1596 from stangri/luci-app-vpnbypass

Browse source 
luci-app-vpnbypass: better service start/stop
This commit is contained in:
Hannu Nyman 2018-01-26 16:21:49 +02:00 committed by GitHub
commit 00262be237
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,9 +7,10 @@ PKG_LICENSE:=GPL-3.0+
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net> PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net>
LUCI_TITLE:=VPN Bypass Web UI LUCI_TITLE:=VPN Bypass Web UI
LUCI_DEPENDS:=+vpnbypass LUCI_DESCRIPTION:=Provides Web UI for VPNBypass service.
LUCI_DEPENDS:=+luci +vpnbypass
LUCI_PKGARCH:=all LUCI_PKGARCH:=all
PKG_RELEASE:=1 PKG_RELEASE:=3
include ../../luci.mk include ../../luci.mk

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

@ -4,19 +4,11 @@ m = Map("vpnbypass", translate("VPN Bypass Settings"))
s = m:section(NamedSection, "config", "vpnbypass") s = m:section(NamedSection, "config", "vpnbypass")
-- General options -- General options
e = s:option(Flag, "enabled", translate("Enable/start service")) e = s:option(Flag, "enabled", translate("Start VPNBypass service"))
e.rmempty = false 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) function e.write(self, section, value)
if value == "1" then if value ~= "1" then
luci.sys.call("/etc/init.d/vpnbypass enable >/dev/null") luci.sys.init.stop("vpnbypass")
luci.sys.call("/etc/init.d/vpnbypass start >/dev/null")
else
luci.sys.call("/etc/init.d/vpnbypass stop >/dev/null")
end end
return Flag.write(self, section, value) return Flag.write(self, section, value)
end end

6
applications/luci-app-vpnbypass/po/templates/vpnbypass.pot
View file

@ -7,9 +7,6 @@ msgstr ""
msgid "Domains to be accessed directly (outside of the VPN tunnel), see" msgid "Domains to be accessed directly (outside of the VPN tunnel), see"
msgstr "" msgstr ""
msgid "Enable/start service"
msgstr ""
msgid "Local IP Addresses to Bypass" msgid "Local IP Addresses to Bypass"
msgstr "" msgstr ""
@ -41,6 +38,9 @@ msgstr ""
msgid "Remote ports to trigger VPN Bypass" msgid "Remote ports to trigger VPN Bypass"
msgstr "" msgstr ""
msgid "Start VPNBypass service"
msgstr ""
msgid "VPN Bypass" msgid "VPN Bypass"
msgstr "" msgstr ""