summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-app-https-dns-proxy
diff options
context:
space:
mode:
authorStan <stangri@melmac.net>2020-08-27 14:38:49 -0700
committerGitHub <noreply@github.com>2020-08-27 14:38:49 -0700
commit5c1f36ceb5c8ccd76bd61e170dd42748d502ba0d (patch)
treedd0a3a692b547b27aefa10ea8545b34aaaece994 /applications/luci-app-https-dns-proxy
parentc0e597ca53d9cee41f8fbc97b6d4f8e961576158 (diff)
parent20ee1f0d47d22be9a69dc24a80addc1fbc89b78b (diff)
Merge pull request #4391 from stangri/master-luci-app-https-dns-proxy
luci-app-https-dns-proxy: add DNSPod.cn DoH
Diffstat (limited to 'applications/luci-app-https-dns-proxy')
-rw-r--r--applications/luci-app-https-dns-proxy/Makefile2
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.alidns.dns.lua10
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/pub.doh.lua6
-rw-r--r--applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot6
4 files changed, 17 insertions, 7 deletions
diff --git a/applications/luci-app-https-dns-proxy/Makefile b/applications/luci-app-https-dns-proxy/Makefile
index 6ce17ecbcb..0b933b560f 100644
--- a/applications/luci-app-https-dns-proxy/Makefile
+++ b/applications/luci-app-https-dns-proxy/Makefile
@@ -10,7 +10,7 @@ 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:=11
+PKG_RELEASE:=12
include ../../luci.mk
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.alidns.dns.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.alidns.dns.lua
index 6e53e48689..4ef78c1cbe 100644
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.alidns.dns.lua
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.alidns.dns.lua
@@ -1,6 +1,6 @@
-return{
-name="Alidns",
-label=_("Alidns"),
-resolver_url="https://dns.alidns.com/dns-query",
-bootstrap_dns="223.5.5.5,223.6.6.6,2400:3200::1,2400:3200:baba::1"
+return {
+ name="AliDNS",
+ label=_("AliDNS"),
+ resolver_url="https://dns.alidns.com/dns-query",
+ bootstrap_dns="223.5.5.5,223.6.6.6,2400:3200::1,2400:3200:baba::1"
}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/pub.doh.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/pub.doh.lua
new file mode 100644
index 0000000000..6e831f7fb0
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/pub.doh.lua
@@ -0,0 +1,6 @@
+return{
+ name = "DNSPod-cn-Public-DNS",
+ label = _("DNSPod.cn Public DNS"),
+ resolver_url = "https://doh.pub/dns-query",
+ bootstrap_dns = "119.29.29.29,119.28.28.28"
+}
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 4dabe76cf1..ea3bfbdb23 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
@@ -14,7 +14,7 @@ msgid "AdGuard (Standard)"
msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.alidns.dns.lua:3
-msgid "Alidns"
+msgid "AliDNS"
msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/ca.cira.canadianshield.family.lua:3
@@ -65,6 +65,10 @@ msgstr ""
msgid "DNS.SB"
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/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
msgid "Digitale Gesellschaft"
msgstr ""