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

Merge pull request #4008 from stangri/master-luci-app-vpn-policy-routing

Browse source 
luci-app-vpn-policy-routing: support phys-dev policies
This commit is contained in:
Stan 2020-05-04 15:55:36 -07:00 committed by GitHub
commit a232bcf8fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/luci-app-vpn-policy-routing/Makefile
View file

@ -10,7 +10,7 @@ LUCI_TITLE:=VPN Policy-Based Routing Service Web UI
LUCI_DESCRIPTION:=Provides Web UI for vpn-policy-routing service. LUCI_DESCRIPTION:=Provides Web UI for vpn-policy-routing service.
LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +vpn-policy-routing LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +vpn-policy-routing
LUCI_PKGARCH:=all LUCI_PKGARCH:=all
PKG_RELEASE:=72 PKG_RELEASE:=73
include ../../luci.mk include ../../luci.mk

2
applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua
View file

@ -282,7 +282,7 @@ if laPlaceholder then
la.placeholder = laPlaceholder la.placeholder = laPlaceholder
end end
la.rmempty = true la.rmempty = true
la.datatype = 'list(neg(or(host,network,macaddr)))' la.datatype = 'list(neg(or(host,network,macaddr,string)))'
lp = p:option(Value, "src_port", translate("Local ports")) lp = p:option(Value, "src_port", translate("Local ports"))
lp.datatype = 'list(neg(or(portrange, string)))' lp.datatype = 'list(neg(or(portrange, string)))'

4
applications/luci-app-vpn-policy-routing/po/templates/vpn-policy-routing.pot
View file

@ -161,10 +161,6 @@ msgstr ""
msgid "Force the ICMP protocol interface." msgid "Force the ICMP protocol interface."
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/root/usr/share/rpcd/acl.d/luci-app-vpn-policy-routing.json:3
msgid "Grant UCI access for luci-app-vpn-policy-routing"
msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:200 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:200
msgid "IP Rules Support" msgid "IP Rules Support"
msgstr "" msgstr ""