diff options
| author | Stan <stangri@melmac.net> | 2020-05-04 15:55:36 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-04 15:55:36 -0700 |
| commit | a232bcf8fb171f43281cb0e8aaa6af2be9eac1a4 (patch) | |
| tree | be97337d428ffca1ca4d14a1f91f3d3691acfcf2 | |
| parent | f0a0d28fdd22b7904ea9a4efb53a7b791dc6dead (diff) | |
| parent | 92fc94a0bdcaf48ec5a89892f2b7c429e15cf806 (diff) | |
Merge pull request #4008 from stangri/master-luci-app-vpn-policy-routing
luci-app-vpn-policy-routing: support phys-dev policies
3 files changed, 2 insertions, 6 deletions
diff --git a/applications/luci-app-vpn-policy-routing/Makefile b/applications/luci-app-vpn-policy-routing/Makefile index 7b1b2f6928..6daf81b5c8 100644 --- a/applications/luci-app-vpn-policy-routing/Makefile +++ b/applications/luci-app-vpn-policy-routing/Makefile @@ -10,7 +10,7 @@ LUCI_TITLE:=VPN Policy-Based Routing Service Web UI LUCI_DESCRIPTION:=Provides Web UI for vpn-policy-routing service. LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +vpn-policy-routing LUCI_PKGARCH:=all -PKG_RELEASE:=72 +PKG_RELEASE:=73 include ../../luci.mk diff --git a/applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua b/applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua index 1004f82753..692c771a43 100644 --- a/applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua +++ b/applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua @@ -282,7 +282,7 @@ if laPlaceholder then la.placeholder = laPlaceholder end 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.datatype = 'list(neg(or(portrange, string)))' diff --git a/applications/luci-app-vpn-policy-routing/po/templates/vpn-policy-routing.pot b/applications/luci-app-vpn-policy-routing/po/templates/vpn-policy-routing.pot index 55c9cd15e8..4995978447 100644 --- a/applications/luci-app-vpn-policy-routing/po/templates/vpn-policy-routing.pot +++ b/applications/luci-app-vpn-policy-routing/po/templates/vpn-policy-routing.pot @@ -161,10 +161,6 @@ msgstr "" msgid "Force the ICMP protocol interface." 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 msgid "IP Rules Support" msgstr "" |