From: Stan Grishin Date: Wed, 12 Feb 2025 04:06:59 +0000 (+0000) Subject: luci-app-pbr: update to 1.1.8-10 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a318e6d13d99efb864eb6d98408da3f6e291e03e;p=project%2Fluci.git luci-app-pbr: update to 1.1.8-10 * fix documentation URL in README * improve supported_interface description * improve ignored_interface description Signed-off-by: Stan Grishin --- diff --git a/applications/luci-app-pbr/Makefile b/applications/luci-app-pbr/Makefile index 9f893f2e03..6c2ef0745b 100644 --- a/applications/luci-app-pbr/Makefile +++ b/applications/luci-app-pbr/Makefile @@ -7,7 +7,7 @@ PKG_NAME:=luci-app-pbr PKG_LICENSE:=AGPL-3.0-or-later PKG_MAINTAINER:=Stan Grishin PKG_VERSION:=1.1.8 -PKG_RELEASE:=6 +PKG_RELEASE:=10 LUCI_TITLE:=Policy Based Routing Service Web UI LUCI_URL:=https://github.com/stangri/luci-app-pbr/ diff --git a/applications/luci-app-pbr/README.md b/applications/luci-app-pbr/README.md index facd5623dd..6e83d50f82 100644 --- a/applications/luci-app-pbr/README.md +++ b/applications/luci-app-pbr/README.md @@ -1,4 +1,3 @@ # README -Documentation for this project is available at [https://docs.openwrt.melmac.net/luci-app-pbr/](https://docs.openwrt.melmac.net/luci-app-pbr/). - +Documentation for this project is available at [https://docs.openwrt.melmac.net/pbr/](https://docs.openwrt.melmac.net/pbr/). diff --git a/applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js b/applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js index 0b35268ec3..1e76efc171 100644 --- a/applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js +++ b/applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js @@ -141,7 +141,11 @@ return view.extend({ _("Supported Interfaces"), _( "Allows to specify the list of interface names (in lower case) to be explicitly supported by the service. " + - "Can be useful if your OpenVPN tunnels have dev option other than tun* or tap*." + "Can be useful if your OpenVPN tunnels have dev option other than tun* or tap* or specific use cases " + + "of WireGuard servers. See the %sREADME%s for details." + ).format( + '', + "" ) ); o.optional = false; @@ -152,8 +156,13 @@ return view.extend({ "ignored_interface", _("Ignored Interfaces"), _( - "Allows to specify the list of interface names (in lower case) to be ignored by the service. " + - "Can be useful if running both VPN server and VPN client on the router." + "Allows to specify the list of interface names (lower case) to be ignored by the service. " + + "Can be useful for an OpenVPN server running on OpenWrt device. WireGuard servers, which " + + "have a listen_port defined, are handled automatically, do not add those here." + + "See the %sREADME%s for details." + ).format( + '', + "" ) ); o.optional = false; diff --git a/applications/luci-app-pbr/po/templates/pbr.pot b/applications/luci-app-pbr/po/templates/pbr.pot index cd347bff33..4299682269 100644 --- a/applications/luci-app-pbr/po/templates/pbr.pot +++ b/applications/luci-app-pbr/po/templates/pbr.pot @@ -25,15 +25,15 @@ msgstr "" msgid "AdGuardHome ipset" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:168 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:177 msgid "Add" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:225 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:234 msgid "Add Ignore Target" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:227 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:236 msgid "" "Adds 'ignore' to the list of interfaces for policies. See the %sREADME%s for " "details." @@ -47,21 +47,23 @@ msgstr "" msgid "" "Allows to specify the list of interface names (in lower case) to be " "explicitly supported by the service. Can be useful if your OpenVPN tunnels " -"have dev option other than tun* or tap*." +"have dev option other than tun* or tap* or specific use cases of WireGuard " +"servers. See the %sREADME%s for details." msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:155 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:159 msgid "" -"Allows to specify the list of interface names (in lower case) to be ignored " -"by the service. Can be useful if running both VPN server and VPN client on " -"the router." +"Allows to specify the list of interface names (lower case) to be ignored by " +"the service. Can be useful for an OpenVPN server running on OpenWrt device. " +"WireGuard servers, which have a listen_port defined, are handled " +"automatically, do not add those here.See the %sREADME%s for details." msgstr "" #: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:43 msgid "Basic Configuration" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:312 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:321 msgid "Chain" msgstr "" @@ -81,7 +83,7 @@ msgstr "" msgid "Controls both system log and console output verbosity." msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:393 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:402 msgid "Custom User File Includes" msgstr "" @@ -89,19 +91,19 @@ msgstr "" msgid "Custom user file '%s' not found or empty" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:331 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:340 msgid "DNS Policies" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:384 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:393 msgid "DSCP Tag" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:371 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:380 msgid "DSCP Tagging" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:176 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:185 msgid "Default ICMP Interface" msgstr "" @@ -119,7 +121,7 @@ msgstr "" #: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:114 #: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:134 -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:233 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:242 msgid "Disabled" msgstr "" @@ -127,7 +129,7 @@ msgstr "" msgid "Disabling %s service" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:243 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:252 msgid "Display these protocols in protocol column in Web UI." msgstr "" @@ -158,10 +160,10 @@ msgid "Enable" msgstr "" #: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:135 -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:234 -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:265 -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:345 -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:406 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:243 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:274 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:354 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:415 msgid "Enabled" msgstr "" @@ -177,7 +179,7 @@ msgstr "" msgid "Errors encountered, please check the %sREADME%s" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:210 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:219 msgid "" "FW Mask used by the service. High mask is used to avoid conflict with SQM/" "QoS. Change with caution together with" @@ -211,7 +213,7 @@ msgstr "" msgid "Failed to set up any gateway" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:177 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:186 msgid "Force the ICMP protocol interface." msgstr "" @@ -223,7 +225,7 @@ msgstr "" msgid "IPv6 Support" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:153 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:157 msgid "Ignored Interfaces" msgstr "" @@ -245,7 +247,7 @@ msgid "" "support" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:169 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:178 msgid "Insert" msgstr "" @@ -261,7 +263,7 @@ msgstr "" msgid "Installed AdGuardHome (%s) doesn't support 'ipset_file' option." msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:321 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:330 msgid "Interface" msgstr "" @@ -277,12 +279,12 @@ msgstr "" msgid "Invalid OpenVPN config for '%s' interface" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:271 -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:352 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:280 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:361 msgid "Local addresses / devices" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:277 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:286 msgid "Local ports" msgstr "" @@ -294,12 +296,12 @@ msgstr "" msgid "Mode" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:269 -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:349 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:278 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:358 msgid "Name" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:252 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:261 msgid "" "Name, interface and at least one other field are required. Multiple local " "and remote addresses/devices/domains and ports can be space separated. " @@ -307,14 +309,14 @@ msgid "" "fields are left blank. For more information on options, check the %sREADME%s." msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:333 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:342 msgid "" "Name, local address and remote DNS fields are required. Multiple local " "addresses/devices can be space separated. For more information on options, " "check the %sREADME%s." msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:179 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:188 msgid "No Change" msgstr "" @@ -327,7 +329,7 @@ msgstr "" msgid "Output verbosity" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:411 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:420 msgid "Path" msgstr "" @@ -361,7 +363,7 @@ msgstr "" msgid "Please unset 'src_addr', 'src_port' and 'dest_port' for policy '%s'" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:250 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:259 msgid "Policies" msgstr "" @@ -402,7 +404,7 @@ msgstr "" msgid "Policy Routing" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:295 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:304 msgid "Protocol" msgstr "" @@ -414,15 +416,15 @@ msgstr "" msgid "Refer to https://docs.openwrt.melmac.net/pbr/#procd_wan_interface" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:359 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:368 msgid "Remote DNS" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:283 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:292 msgid "Remote addresses / domains" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:289 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:298 msgid "Remote ports" msgstr "" @@ -460,11 +462,11 @@ msgstr "" msgid "Restarting %s service" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:165 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:174 msgid "Rule Create option" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:395 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:404 msgid "" "Run the following user files after setting up but before restarting DNSMASQ. " "See the %sREADME%s for details." @@ -478,7 +480,7 @@ msgstr "" msgid "See the %sREADME%s for details." msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:166 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:175 msgid "Select Add for -A/add and Insert for -I/Insert." msgstr "" @@ -490,8 +492,8 @@ msgstr "" msgid "Service Errors" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:197 -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:208 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:206 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:217 msgid "Service FW Mask" msgstr "" @@ -507,7 +509,7 @@ msgstr "" msgid "Service Warnings" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:373 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:382 msgid "" "Set DSCP tags (in range between 1 and 63) for specific interfaces. See the " "%sREADME%s for details." @@ -525,7 +527,7 @@ msgstr "" msgid "Starting %s service" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:193 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:202 msgid "" "Starting (WAN) FW Mark for marks used by the service. High starting mark is " "used to avoid conflict with SQM/QoS. Change with caution together with" @@ -563,7 +565,7 @@ msgstr "" msgid "Supported Interfaces" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:242 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:251 msgid "Supported Protocols" msgstr "" @@ -667,8 +669,8 @@ msgstr "" msgid "Version %s" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:191 -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:214 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:200 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:223 msgid "WAN Table FW Mark" msgstr "" @@ -676,7 +678,7 @@ msgstr "" msgid "Web UI Configuration" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:304 +#: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:313 msgid "all" msgstr ""