From 92fc94a0bdcaf48ec5a89892f2b7c429e15cf806 Mon Sep 17 00:00:00 2001 From: Stan Grishin Date: Mon, 4 May 2020 22:54:14 +0000 Subject: [PATCH] luci-app-vpn-policy-routing: support phys-dev policies Signed-off-by: Stan Grishin --- applications/luci-app-vpn-policy-routing/Makefile | 2 +- .../luasrc/model/cbi/vpn-policy-routing.lua | 2 +- .../po/templates/vpn-policy-routing.pot | 4 ---- 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 7b1b2f692..6daf81b5c 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 1004f8275..692c771a4 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 55c9cd15e..499597844 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 "" -- 2.25.1