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

luci-app-vpnbypass: updated service start/enable logic.

Browse source
This commit is contained in:
Stan Grishin 2017-03-05 10:25:00 -08:00
parent 3ff56f8cfb
commit e86438fa76
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,7 +9,8 @@ PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net>
LUCI_TITLE:=VPN Bypass Web UI LUCI_TITLE:=VPN Bypass Web UI
LUCI_DEPENDS:=+vpnbypass LUCI_DEPENDS:=+vpnbypass
LUCI_PKGARCH:=all LUCI_PKGARCH:=all
PKG_RELEASE:=1
include ../../luci.mk include ../../luci.mk
# call BuildPackage - OpenWrt buildroot signature # call BuildPackage - OpenWrt buildroot signature

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

@ -4,11 +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 VPN Bypass")) e = s:option(Flag, "enabled", translate("Enable/start service"))
e.rmempty = false e.rmempty = false
function e.cfgvalue(self, section) function e.cfgvalue(self, section)
return luci.sys.init.enabled("vpnbypass") and self.enabled or self.disabled return self.map:get(section, "enabled") == "1" and luci.sys.init.enabled("vpnbypass") and self.enabled or self.disabled
end end
function e.write(self, section, value) function e.write(self, section, value)
@ -17,35 +17,35 @@ function e.write(self, section, value)
luci.sys.call("/etc/init.d/vpnbypass start >/dev/null") luci.sys.call("/etc/init.d/vpnbypass start >/dev/null")
else else
luci.sys.call("/etc/init.d/vpnbypass stop >/dev/null") luci.sys.call("/etc/init.d/vpnbypass stop >/dev/null")
luci.sys.call("/etc/init.d/vpnbypass disable >/dev/null")
end end
return Flag.write(self, section, value)
end end
-- Local Ports -- Local Ports
p1 = s:option(DynamicList, "localport", translate("Local Ports to Bypass"), translate("Local ports to trigger VPN Bypass")) p1 = s:option(DynamicList, "localport", translate("Local Ports to Bypass"), translate("Local ports to trigger VPN Bypass"))
p1.datatype = "portrange" p1.datatype = "portrange"
p1.placeholder = "0-65535" -- p1.placeholder = "0-65535"
p1.addremove = false p1.addremove = false
p1.optional = false p1.optional = false
-- Remote Ports -- Remote Ports
p2 = s:option(DynamicList, "remoteport", translate("Remote Ports to Bypass"), translate("Remote ports to trigger VPN Bypass")) p2 = s:option(DynamicList, "remoteport", translate("Remote Ports to Bypass"), translate("Remote ports to trigger VPN Bypass"))
p2.datatype = "portrange" p2.datatype = "portrange"
p2.placeholder = "0-65535" -- p2.placeholder = "0-65535"
p2.addremove = false p2.addremove = false
p2.optional = false p2.optional = false
-- Local Subnets -- Local Subnets
r1 = s:option(DynamicList, "localsubnet", translate("Local IP Addresses to Bypass"), translate("Local IP addresses or subnets with direct internet access (outside of the VPN tunnel)")) r1 = s:option(DynamicList, "localsubnet", translate("Local IP Addresses to Bypass"), translate("Local IP addresses or subnets with direct internet access (outside of the VPN tunnel)"))
r1.datatype = "ip4addr" r1.datatype = "ip4addr"
r1.placeholder = luci.ip.new(uci.cursor():get("network", "lan", "ipaddr") .. "/" .. uci.cursor():get("network", "lan", "netmask")) -- r1.placeholder = luci.ip.new(uci.cursor():get("network", "lan", "ipaddr") .. "/" .. uci.cursor():get("network", "lan", "netmask"))
r1.addremove = false r1.addremove = false
r1.optional = false r1.optional = false
-- Remote Subnets -- Remote Subnets
r2 = s:option(DynamicList, "remotesubnet", translate("Remote IP Addresses to Bypass"), translate("Remote IP addresses or subnets which will be accessed directly (outside of the VPN tunnel)")) r2 = s:option(DynamicList, "remotesubnet", translate("Remote IP Addresses to Bypass"), translate("Remote IP addresses or subnets which will be accessed directly (outside of the VPN tunnel)"))
r2.datatype = "ip4addr" r2.datatype = "ip4addr"
r2.placeholder = "0.0.0.0/0" -- r2.placeholder = "0.0.0.0/0"
r2.addremove = false r2.addremove = false
r2.optional = false r2.optional = false

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

@ -7,7 +7,7 @@ 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 VPN Bypass" msgid "Enable/start service"
msgstr "" msgstr ""
msgid "Local IP Addresses to Bypass" msgid "Local IP Addresses to Bypass"