From 7e327c13783540fca544ae0d389ceca866142971 Mon Sep 17 00:00:00 2001 From: Stan Grishin Date: Wed, 13 Jan 2021 12:01:52 +0000 Subject: [PATCH] luci-app-https-dns-proxy: DSCP tagging support Signed-off-by: Stan Grishin --- applications/luci-app-https-dns-proxy/Makefile | 1 - .../providers.disabled/ca.dnscrypt.dns1.lua | 8 ++++++++ .../providers.disabled/ca.dnscrypt.dns2.lua | 8 ++++++++ .../luasrc/model/cbi/https-dns-proxy.lua | 4 ++++ .../po/templates/https-dns-proxy.pot | 18 +++++++++++++++++- 5 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ca.dnscrypt.dns1.lua create mode 100644 applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ca.dnscrypt.dns2.lua diff --git a/applications/luci-app-https-dns-proxy/Makefile b/applications/luci-app-https-dns-proxy/Makefile index 3ee17aee4f..c93a893b19 100644 --- a/applications/luci-app-https-dns-proxy/Makefile +++ b/applications/luci-app-https-dns-proxy/Makefile @@ -10,7 +10,6 @@ LUCI_TITLE:=DNS Over HTTPS Proxy Web UI LUCI_DESCRIPTION:=Provides Web UI for DNS Over HTTPS Proxy LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +https-dns-proxy LUCI_PKGARCH:=all -PKG_RELEASE:=13 include ../../luci.mk diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ca.dnscrypt.dns1.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ca.dnscrypt.dns1.lua new file mode 100644 index 0000000000..2fa9985592 --- /dev/null +++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ca.dnscrypt.dns1.lua @@ -0,0 +1,8 @@ +return{ + name="DnsCryptCa-DNS1", + label=_("DNSCrypt.ca (DNS1)"), + resolver_url="https://dns1.dnscrypt.ca:453/dns-query", + bootstrap_dns="45.76.37.222,185.112.145.13,93.95.226.53,2001:19f0:5001:185a:5400:ff:fe50:56d5", + help_link="https://dnscrypt.ca/", + help_link_text="dnscrypt.ca" +} diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ca.dnscrypt.dns2.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ca.dnscrypt.dns2.lua new file mode 100644 index 0000000000..f31dd38a23 --- /dev/null +++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ca.dnscrypt.dns2.lua @@ -0,0 +1,8 @@ +return{ + name="DnsCryptCa-DNS2", + label=_("DNSCrypt.ca (DNS2)"), + resolver_url="https://dns2.dnscrypt.ca:453/dns-query", + bootstrap_dns="45.76.37.222,185.112.145.13,93.95.226.53,2001:19f0:5001:185a:5400:ff:fe50:56d5", + help_link="https://dnscrypt.ca/", + help_link_text="dnscrypt.ca" +} diff --git a/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua b/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua index 8842909c8c..ea4b0d8af0 100644 --- a/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua +++ b/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua @@ -186,6 +186,10 @@ lp = s3:option(Value, "listen_port", translate("Listen port")) lp.datatype = "port" lp.value = n + 5053 +dscp = s3:option(Value, "dscp_codepoint", translate("DSCP Codepoint")) +dscp.datatype = "range(0,63)" +dscp.rmempty = true + ps = s3:option(Value, "proxy_server", translate("Proxy server")) ps.rmempty = true diff --git a/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot b/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot index d272b29973..970e354344 100644 --- a/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot +++ b/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot @@ -69,10 +69,22 @@ msgstr "" msgid "DNS.SB" msgstr "" +#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ca.dnscrypt.dns1.lua:3 +msgid "DNSCrypt.ca (DNS1)" +msgstr "" + +#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ca.dnscrypt.dns2.lua:3 +msgid "DNSCrypt.ca (DNS2)" +msgstr "" + #: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/pub.doh.lua:3 msgid "DNSPod.cn Public DNS" msgstr "" +#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:189 +msgid "DSCP Codepoint" +msgstr "" + #: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3 msgid "Digitale Gesellschaft" msgstr "" @@ -97,6 +109,10 @@ msgstr "" msgid "Google" msgstr "" +#: applications/luci-app-https-dns-proxy/root/usr/share/rpcd/acl.d/luci-app-https-dns-proxy.json:3 +msgid "Grant UCI and file access for luci-app-https-dns-proxy" +msgstr "" + #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126 msgid "" "If update DNSMASQ config is selected, when you add/remove any instances " @@ -140,7 +156,7 @@ msgstr "" msgid "OpenDNS (Family Shield)" msgstr "" -#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:189 +#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:193 msgid "Proxy server" msgstr "" -- 2.30.2