Merge pull request #3844 from DinStamou/feature_libredns

luci-app-https-dns-proxy: Add LibreDNS as a DoH provider

diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/gr.libredns.doh-ads.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/gr.libredns.doh-ads.lua
new file mode 100644 (file)
index 0000000..e6fba2e
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/gr.libredns.doh-ads.lua
@@ -0,0 +1,6 @@
+return {
+       name = "LibreDNS",
+       label = _("LibreDNS (No Ads)"),
+       resolver_url = "https://doh.libredns.gr/ads",
+       bootstrap_dns = "116.202.176.26"
+}

diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/gr.libredns.doh.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/gr.libredns.doh.lua
new file mode 100644 (file)
index 0000000..24d2cee
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/gr.libredns.doh.lua
@@ -0,0 +1,6 @@
+return {
+       name = "LibreDNS",
+       label = _("LibreDNS"),
+       resolver_url = "https://doh.libredns.gr/dns-query",
+       bootstrap_dns = "116.202.176.26"
+}

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 405eb2a846accdce3875e1325e50df59af1a0327..a50b5b17c9bbbcaab15b8634a0759d0232b7022d 100644 (file)
--- 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
@@ -91,7 +91,9 @@ s3 = m:section(TypedSection, "https-dns-proxy", translate("Instances"), translat
                .. [[ <a href="https://adguard.com/en/adguard-dns/overview.html">]]
     .. "AdGuard.com" .. [[</a>]] .. ", "
                .. [[ <a href="https://cleanbrowsing.org/guides/dnsoverhttps">]]
-    .. "CleanBrowsing.org" .. [[</a>]] .. " " .. translate("and") .. " "
+    .. "CleanBrowsing.org" .. [[</a>]] .. " "
+                .. [[ <a href="https://libredns.gr/">]]
+    .. "Libredns.gr" .. [[</a]] .. " " .. translate("and") .. " "
                .. [[ <a href="https://www.quad9.net/doh-quad9-dns-servers/">]]
     .. "Quad9.net" .. [[</a>]] .. ".")
 s3.template = "cbi/tblsection"

diff --git a/applications/luci-app-https-dns-proxy/po/en/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/en/https-dns-proxy.po
index 9dc2bebfb56c72d6b8ac59bbc5ad42045ab1fc4d..4c462b5c4dcfbaf594c5f078c2fe3e1578f5f9bc 100644 (file)
--- a/applications/luci-app-https-dns-proxy/po/en/https-dns-proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/en/https-dns-proxy.po
@@ -88,6 +88,14 @@ msgstr ""
 msgid "Loading"
 msgstr ""
 
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/gr.libredns.doh.lua:3
+msgid "LibreDNS"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/gr.libredns.doh-ads.lua:3
+msgid "LibreDNS (No Ads)"
+msgstr ""
+
 #: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
 msgid "ODVR (nic.cz)"
 msgstr ""

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 78352cc7adebcd3dbd1e377bcb9156ba06e153d2..2a418d8198a3387b9b28b65688c5411eb413ec82 100644 (file)
--- 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
@@ -85,6 +85,14 @@ msgstr ""
 msgid "Loading"
 msgstr ""
 
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/gr.libredns.doh.lua:3
+msgid "LibreDNS"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/gr.libredns.doh-ads.lua:3
+msgid "LibreDNS (No Ads)"
+msgstr ""
+
 #: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
 msgid "ODVR (nic.cz)"
 msgstr ""