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

Merge pull request #6392 from stangri/master-luci-app-https-dns-proxy

Browse source 
luci-app-https-dns-proxy: fix curl-related error in logs
This commit is contained in:
Stan Grishin 2023-05-19 15:54:03 -06:00 committed by GitHub
commit 2a88a72da4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/luci-app-https-dns-proxy/Makefile
View file

@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_LICENSE:=GPL-3.0-or-later
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
PKG_VERSION:=2022-10-15-11
PKG_VERSION:=2022-10-15-14
LUCI_TITLE:=DNS Over HTTPS Proxy Web UI
LUCI_DESCRIPTION:=Provides Web UI for DNS Over HTTPS Proxy

2
applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua
View file

@ -103,7 +103,7 @@ else
end
end
if sys.call("curl --version | grep -q HTTP2") == 0 then
if sys.call("grep -q 'Provides: libnghttp2' /usr/lib/opkg/status") == 0 then
http2Supported = true
end

14
applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot
View file

@ -14,16 +14,10 @@ msgid "360 Secure DNS - CN"
msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/io.adguard-dns.dns-family.lua:3
msgid "AdGuard (Family Protection)"
msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/io.adguard-dns.dns-nonfiltering.lua:3
msgid "AdGuard (Non-filtering)"
msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/io.adguard-dns.dns.lua:3
msgid "AdGuard (Standard)"
msgstr ""
@ -171,17 +165,14 @@ msgstr ""
msgid "Configuration"
msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.malware-ads-social.lua:3
#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.p3.lua:3
msgid "ControlD (Block Malware + Ads + Social)"
msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.malware-ads.lua:3
#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.p2.lua:3
msgid "ControlD (Block Malware + Ads)"
msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.malware.lua:3
#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.p1.lua:3
msgid "ControlD (Block Malware)"
msgstr ""
@ -191,7 +182,6 @@ msgid "ControlD (Family)"
msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.p0.lua:3
#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.unfiltered.lua:3
msgid "ControlD (Unfiltered)"
msgstr ""
@ -460,10 +450,6 @@ msgstr ""
msgid "Tiarap Public DNS - SG"
msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cn.edu.tsinghua.tuna.dns.lua:3
msgid "Tsinghua University Secure DNS - CN"
msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:65
msgid "Unknown Provider"
msgstr ""