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

luci-app-https-dns-proxy: package name change, support for RFC8484 binary

65 files changed, 269 insertions, 348 deletions

diff --git a/applications/luci-app-https_dns_proxy/Makefile b/applications/luci-app-https-dns-proxy/Makefile
index bd6cf9bd1b..47e8971919 100644
--- a/applications/luci-app-https_dns_proxy/Makefile
+++ b/applications/luci-app-https-dns-proxy/Makefile
@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net>
 
-LUCI_TITLE:=HTTPS DNS Proxy Web UI
-LUCI_DESCRIPTION:=Provides Web UI for HTTPS DNS Proxy
-LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +https_dns_proxy
+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:=9
+PKG_RELEASE:=1
 
 include ../../luci.mk
 
diff --git a/applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua b/applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua
index 826f3f691f..d236feae0a 100644
--- a/applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua
+++ b/applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua
@@ -1,13 +1,13 @@
-module("luci.controller.https_dns_proxy", package.seeall)
+module("luci.controller.https-dns-proxy", package.seeall)
 function index()
-	if nixio.fs.access("/etc/config/https_dns_proxy") then
-		entry({"admin", "services", "https_dns_proxy"}, cbi("https_dns_proxy"), _("DNS over HTTPS Proxy"))
-		entry({"admin", "services", "https_dns_proxy", "action"}, call("https_dns_proxy_action"), nil).leaf = true
+	if nixio.fs.access("/etc/config/https-dns-proxy") then
+		entry({"admin", "services", "https-dns-proxy"}, cbi("https-dns-proxy"), _("DNS Over HTTPS Proxy"))
+		entry({"admin", "services", "https-dns-proxy", "action"}, call("https_dns_proxy_action"), nil).leaf = true
 	end
 end
 
 function https_dns_proxy_action(name)
-	local packageName = "https_dns_proxy"
+	local packageName = "https-dns-proxy"
 	if name == "start" then
 		luci.sys.init.start(packageName)
 	elseif name == "action" then
diff --git a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua
index 723ca894c3..fc190437ca 100644
--- a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua
@@ -1,6 +1,6 @@
 return {
 	name = "Digitale-Gesellschaft",
 	label = _("Digitale Gesellschaft"),
-	url_prefix = "https://dns.digitale-gesellschaft.ch/dns-query?",
+	resolver_url = "https://dns.digitale-gesellschaft.ch/dns-query",
 	bootstrap_dns = "185.95.218.42,185.95.218.43"
 }
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua
new file mode 100644
index 0000000000..86c4c56dc1
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua
@@ -0,0 +1,6 @@
+return {
+	name = "rubyfish.cn",
+	label = _("rubyfish.cn"),
+	resolver_url = "https://dns.rubyfish.cn/dns-query",
+	bootstrap_dns = "118.89.110.78,47.96.179.163"
+}
diff --git a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua
index 50dc74288a..114d23ed5b 100644
--- a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua
@@ -1,6 +1,6 @@
 return {
 	name = "DNS.SB",
 	label = _("DNS.SB"),
-	url_prefix = "https://doh.dns.sb/dns-query?",
+	resolver_url = "https://doh.dns.sb/dns-query",
 	bootstrap_dns = "185.222.222.222,185.184.222.222"
 }
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua
new file mode 100644
index 0000000000..5fb6df3632
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua
@@ -0,0 +1,6 @@
+return {
+	name = "AdGuard-Family",
+	label = _("AdGuard (Family Protection)"),
+	resolver_url = "https://dns-family.adguard.com/dns-query",
+	bootstrap_dns = "176.103.130.132,176.103.130.134"
+}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua
new file mode 100644
index 0000000000..950f203f6e
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua
@@ -0,0 +1,6 @@
+return {
+	name = "AdGuard-Standard",
+	label = _("AdGuard (Standard)"),
+	resolver_url = "https://dns.adguard.com/dns-query",
+	bootstrap_dns = "176.103.130.130,176.103.130.131"
+}
diff --git a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua
index 74d9273bcd..e8673d5d58 100644
--- a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua
@@ -1,6 +1,6 @@
 return {
 	name = "Cloudflare",
 	label = _("Cloudflare"),
-	url_prefix = "https://cloudflare-dns.com/dns-query?ct=application/dns-json&",
+	resolver_url = "https://cloudflare-dns.com/dns-query",
 	bootstrap_dns = "1.1.1.1,1.0.0.1"
 }
diff --git a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua
index e47576be86..3dfe309368 100644
--- a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua
@@ -1,6 +1,6 @@
 return {
 	name = "odvr-nic-cz",
 	label = _("ODVR (nic.cz)"),
-	url_prefix = "https://odvr.nic.cz/doh?",
+	resolver_url = "https://odvr.nic.cz/doh",
 	bootstrap_dns = "193.17.47.1,185.43.135.1"
 }
diff --git a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua
index 168f3f7aa4..6eab04064b 100644
--- a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua
@@ -1,7 +1,7 @@
 return {
 	name = "Google",
 	label = _("Google"),
-	url_prefix = "https://dns.google.com/resolve?",
+	resolver_url = "https://dns.google/dns-query",
 	bootstrap_dns = "8.8.8.8,8.8.4.4",
 	default = true
 }
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua
new file mode 100644
index 0000000000..89becb18b3
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua
@@ -0,0 +1,6 @@
+return {
+	name = "Quad9-Recommended",
+	label = _("Quad 9 (Recommended)"),
+	resolver_url = "https://dns.quad9.net/dns-query",
+	bootstrap_dns = "9.9.9.9,149.112.112.112"
+}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua
new file mode 100644
index 0000000000..67c24fa774
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua
@@ -0,0 +1,6 @@
+return {
+	name = "Quad9-Unsecured",
+	label = _("Quad 9 (Unsecured)"),
+	resolver_url = "https://dns10.quad9.net/dns-query",
+	bootstrap_dns = "9.9.9.10,149.112.112.10"
+}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua
new file mode 100644
index 0000000000..e367794820
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua
@@ -0,0 +1,6 @@
+return {
+	name = "Quad9-ECS",
+	label = _("Quad 9 (Secured with ECS Support)"),
+	resolver_url = "https://dns11.quad9.net/dns-query",
+	bootstrap_dns = "9.9.9.11,149.112.112.11"
+}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua
new file mode 100644
index 0000000000..e459f2933e
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua
@@ -0,0 +1,6 @@
+return {
+	name = "Quad9-Secured",
+	label = _("Quad 9 (Secured)"),
+	resolver_url = "https://dns9.quad9.net/dns-query",
+	bootstrap_dns = "9.9.9.9,149.112.112.9"
+}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua
new file mode 100644
index 0000000000..e81637935b
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua
@@ -0,0 +1,6 @@
+return {
+	name = "CleanBrowsing-Adult",
+	label = _("CleanBrowsing (Adult Filter)"),
+	resolver_url = "https://doh.cleanbrowsing.org/doh/adult-filter/",
+	bootstrap_dns = "185.228.168.168"
+}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua
new file mode 100644
index 0000000000..9fabda1d77
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua
@@ -0,0 +1,6 @@
+return {
+	name = "CleanBrowsing-Family",
+	label = _("CleanBrowsing (Family Filter)"),
+	resolver_url = "https://doh.cleanbrowsing.org/doh/family-filter/",
+	bootstrap_dns = "185.228.168.168"
+}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua
new file mode 100644
index 0000000000..0bf11f59d8
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua
@@ -0,0 +1,6 @@
+return {
+	name = "CleanBrowsing-Security",
+	label = _("CleanBrowsing (Security Filter)"),
+	resolver_url = "https://doh.cleanbrowsing.org/doh/security-filter/",
+	bootstrap_dns = "185.228.168.168"
+}
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 4e7e02524f..11eca60399 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
@@ -5,7 +5,7 @@ local dispatcher = require "luci.dispatcher"
 local i18n = require "luci.i18n"
 local uci = require("luci.model.uci").cursor()
 
-local packageName = "https_dns_proxy"
+local packageName = "https-dns-proxy"
 local providers_dir = "/usr/lib/lua/luci/" .. packageName .. "/providers/"
 
 function get_provider_name(value)
@@ -14,12 +14,12 @@ function get_provider_name(value)
 		setfenv(p_func, { _ = i18n.translate })
 		local p = p_func()
 		value = value:gsub('[%p%c%s]', '')
-		p.url_match = p.url_prefix:gsub('[%p%c%s]', '')
+		p.url_match = p.resolver_url:gsub('[%p%c%s]', '')
 		if value:match(p.url_match) then
 			return p.label
 		end
 	end
-	return translate("Uknown Provider")
+	return translate("Unknown Provider")
 end
 
 local tmpfsStatus, tmpfsStatusCode
@@ -61,7 +61,7 @@ else
 	end
 end
 
-m = Map("https_dns_proxy", translate("DNS over HTTPS Proxy Settings"))
+m = Map("https-dns-proxy", translate("DNS Over HTTPS Proxy Settings"))
 
 h = m:section(TypedSection, "_dummy", translate("Service Status") .. tmpfsVersion)
 h.template = "cbi/nullsection"
@@ -80,22 +80,30 @@ else
 	buttons.template = packageName .. "/buttons"
 end
 
-s3 = m:section(TypedSection, "https_dns_proxy", translate("Instances"), translate("When you add/remove any instances below, they will be used to override the 'DNS forwardings' section of ")
+s3 = m:section(TypedSection, "https-dns-proxy", translate("Instances"), translate("When you add/remove any instances below, they will be used to override the 'DNS forwardings' section of ")
 		.. [[ <a href="]] .. dispatcher.build_url("admin/network/dhcp") .. [[">]]
-		.. translate("DHCP and DNS") .. [[</a>]] .. ".")
+		.. translate("DHCP and DNS") .. [[</a>]] .. "."
+    .. "<br />"
+    .. translate("For more information on different options check ")
+		.. [[ <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") .. " "
+		.. [[ <a href="https://www.quad9.net/doh-quad9-dns-servers/">]]
+    .. "Quad9.net" .. [[</a>]] .. ".")
 s3.template = "cbi/tblsection"
 s3.sortable  = false
 s3.anonymous = true
 s3.addremove = true
 
-prov = s3:option(ListValue, "url_prefix", translate("Provider"))
+prov = s3:option(ListValue, "resolver_url", translate("Resolver"))
 for filename in fs.dir(providers_dir) do
 	local p_func = loadfile(providers_dir .. filename)
 	setfenv(p_func, { _ = i18n.translate })
 	local p = p_func()
-	prov:value(p.url_prefix, p.label)
+	prov:value(p.resolver_url, p.label)
 	if p.default then
-		prov.default = p.url_prefix
+		prov.default = p.resolver_url
 	end
 end
 prov.forcewrite = true
@@ -106,13 +114,13 @@ prov.write = function(self, section, value)
 		setfenv(p_func, { _ = i18n.translate })
 		local p = p_func()
 		value = value:gsub('[%p%c%s]', '')
-		p.url_match = p.url_prefix:gsub('[%p%c%s]', '')
+		p.url_match = p.resolver_url:gsub('[%p%c%s]', '')
 		if value:match(p.url_match) then
-			uci:set("https_dns_proxy", section, "bootstrap_dns", p.bootstrap_dns)
-			uci:set("https_dns_proxy", section, "url_prefix", p.url_prefix)
+			uci:set(packageName, section, "bootstrap_dns", p.bootstrap_dns)
+			uci:set(packageName, section, "resolver_url", p.resolver_url)
 		end
 	end
-	uci:save("https_dns_proxy")
+	uci:save(packageName)
 end
 
 la = s3:option(Value, "listen_addr", translate("Listen address"))
@@ -121,7 +129,7 @@ la.placeholder = "127.0.0.1"
 la.rmempty     = true
 
 local n = 0
-uci:foreach("https_dns_proxy", "https_dns_proxy", function(s)
+uci:foreach(packageName, packageName, function(s)
 		if s[".name"] == section then
 				return false
 		end
@@ -132,12 +140,10 @@ lp = s3:option(Value, "listen_port", translate("Listen port"))
 lp.datatype = "port"
 lp.value    = n + 5053
 
-sa = s3:option(Value, "subnet_addr", translate("Subnet address"))
-sa.datatype = "host"
+sa = s3:option(Value, "edns_subnet", translate("EDNS client subnet"))
 sa.rmempty  = true
 
 ps = s3:option(Value, "proxy_server", translate("Proxy server"))
-ps.datatype = "host"
 ps.rmempty  = true
 
 return m
diff --git a/applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm b/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm
index 84c5f608d2..52d2b50e52 100644
--- a/applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm
+++ b/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm
@@ -3,7 +3,7 @@
 -%>
 
 <%-
-	local packageName = "https_dns_proxy"
+	local packageName = "https-dns-proxy"
 	local enabledFlag = luci.sys.init.enabled(packageName)
 	local ubusStatus = luci.util.ubus("service", "list", { name = packageName })
 
@@ -33,8 +33,8 @@
 	end
 -%>
 
-<%+https_dns_proxy/css%>
-<%+https_dns_proxy/js%>
+<%+https-dns-proxy/css%>
+<%+https-dns-proxy/js%>
 
 <div class="cbi-value"><label class="cbi-value-title">Service Control</label>
 	<div class="cbi-value-field">
diff --git a/applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/css.htm b/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/css.htm
index 6fb3d51d3b..6fb3d51d3b 100644
--- a/applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/css.htm
+++ b/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/css.htm
diff --git a/applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm b/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm
index 3b0daaa19a..fac92a3925 100644
--- a/applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm
+++ b/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm
@@ -32,7 +32,7 @@
 	btn_enable.disabled = true;
 	btn_disable.disabled = true;
 	spinner(btn_spinner, 1);
-	xhr.get('<%=luci.dispatcher.build_url("admin", "services", "https_dns_proxy", "action")%>/' + action.name, null,
+	xhr.get('<%=luci.dispatcher.build_url("admin", "services", "https-dns-proxy", "action")%>/' + action.name, null,
 		function (x) {
 			if (!x) {
 				return;
diff --git a/applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/status-textarea.htm b/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/status-textarea.htm
index 3840cd19d4..3840cd19d4 100644
--- a/applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/status-textarea.htm
+++ b/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/status-textarea.htm
diff --git a/applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/status.htm b/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/status.htm
index c453428405..c453428405 100644
--- a/applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/status.htm
+++ b/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/status.htm
diff --git a/applications/luci-app-https_dns_proxy/po/bg/https_dns_proxy.po b/applications/luci-app-https-dns-proxy/po/bg/https-dns-proxy.po
index 6418382444..6418382444 100644
--- a/applications/luci-app-https_dns_proxy/po/bg/https_dns_proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/bg/https-dns-proxy.po
diff --git a/applications/luci-app-https_dns_proxy/po/ca/https_dns_proxy.po b/applications/luci-app-https-dns-proxy/po/ca/https-dns-proxy.po
index 0c05a65cdb..0c05a65cdb 100644
--- a/applications/luci-app-https_dns_proxy/po/ca/https_dns_proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/ca/https-dns-proxy.po
diff --git a/applications/luci-app-https_dns_proxy/po/cs/https_dns_proxy.po b/applications/luci-app-https-dns-proxy/po/cs/https-dns-proxy.po
index 77e98ed471..77e98ed471 100644
--- a/applications/luci-app-https_dns_proxy/po/cs/https_dns_proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/cs/https-dns-proxy.po
diff --git a/applications/luci-app-https_dns_proxy/po/de/https_dns_proxy.po b/applications/luci-app-https-dns-proxy/po/de/https-dns-proxy.po
index ca014fc392..ca014fc392 100644
--- a/applications/luci-app-https_dns_proxy/po/de/https_dns_proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/de/https-dns-proxy.po
diff --git a/applications/luci-app-https_dns_proxy/po/el/https_dns_proxy.po b/applications/luci-app-https-dns-proxy/po/el/https-dns-proxy.po
index a72984b497..a72984b497 100644
--- a/applications/luci-app-https_dns_proxy/po/el/https_dns_proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/el/https-dns-proxy.po
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 ab7bd6e7f7..ab7bd6e7f7 100644
--- 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
diff --git a/applications/luci-app-https_dns_proxy/po/es/https_dns_proxy.po b/applications/luci-app-https-dns-proxy/po/es/https-dns-proxy.po
index 7fd7d2fa23..7fd7d2fa23 100644
--- a/applications/luci-app-https_dns_proxy/po/es/https_dns_proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/es/https-dns-proxy.po
diff --git a/applications/luci-app-https_dns_proxy/po/fr/https_dns_proxy.po b/applications/luci-app-https-dns-proxy/po/fr/https-dns-proxy.po
index 3f04542168..3f04542168 100644
--- a/applications/luci-app-https_dns_proxy/po/fr/https_dns_proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/fr/https-dns-proxy.po
diff --git a/applications/luci-app-https_dns_proxy/po/he/https_dns_proxy.po b/applications/luci-app-https-dns-proxy/po/he/https-dns-proxy.po
index 55504b455b..55504b455b 100644
--- a/applications/luci-app-https_dns_proxy/po/he/https_dns_proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/he/https-dns-proxy.po
diff --git a/applications/luci-app-https_dns_proxy/po/hi/https_dns_proxy.po b/applications/luci-app-https-dns-proxy/po/hi/https-dns-proxy.po
index cd3f3b6944..cd3f3b6944 100644
--- a/applications/luci-app-https_dns_proxy/po/hi/https_dns_proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/hi/https-dns-proxy.po
diff --git a/applications/luci-app-https_dns_proxy/po/hu/https_dns_proxy.po b/applications/luci-app-https-dns-proxy/po/hu/https-dns-proxy.po
index 489d94e559..489d94e559 100644
--- a/applications/luci-app-https_dns_proxy/po/hu/https_dns_proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/hu/https-dns-proxy.po
diff --git a/applications/luci-app-https_dns_proxy/po/it/https_dns_proxy.po b/applications/luci-app-https-dns-proxy/po/it/https-dns-proxy.po
index d2786e8ecd..d2786e8ecd 100644
--- a/applications/luci-app-https_dns_proxy/po/it/https_dns_proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/it/https-dns-proxy.po
diff --git a/applications/luci-app-https_dns_proxy/po/ja/https_dns_proxy.po b/applications/luci-app-https-dns-proxy/po/ja/https-dns-proxy.po
index 58845a7700..58845a7700 100644
--- a/applications/luci-app-https_dns_proxy/po/ja/https_dns_proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/ja/https-dns-proxy.po
diff --git a/applications/luci-app-https_dns_proxy/po/ko/https_dns_proxy.po b/applications/luci-app-https-dns-proxy/po/ko/https-dns-proxy.po
index c5b4e75e3e..c5b4e75e3e 100644
--- a/applications/luci-app-https_dns_proxy/po/ko/https_dns_proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/ko/https-dns-proxy.po
diff --git a/applications/luci-app-https_dns_proxy/po/mr/https_dns_proxy.po b/applications/luci-app-https-dns-proxy/po/mr/https-dns-proxy.po
index 5329c1020f..5329c1020f 100644
--- a/applications/luci-app-https_dns_proxy/po/mr/https_dns_proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/mr/https-dns-proxy.po
diff --git a/applications/luci-app-https_dns_proxy/po/ms/https_dns_proxy.po b/applications/luci-app-https-dns-proxy/po/ms/https-dns-proxy.po
index 57b41a7e41..57b41a7e41 100644
--- a/applications/luci-app-https_dns_proxy/po/ms/https_dns_proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/ms/https-dns-proxy.po
diff --git a/applications/luci-app-https_dns_proxy/po/nb_NO/https_dns_proxy.po b/applications/luci-app-https-dns-proxy/po/nb_NO/https-dns-proxy.po
index 5566a8bdfc..5566a8bdfc 100644
--- a/applications/luci-app-https_dns_proxy/po/nb_NO/https_dns_proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/nb_NO/https-dns-proxy.po
diff --git a/applications/luci-app-https_dns_proxy/po/pl/https_dns_proxy.po b/applications/luci-app-https-dns-proxy/po/pl/https-dns-proxy.po
index 1b2edc9898..1b2edc9898 100644
--- a/applications/luci-app-https_dns_proxy/po/pl/https_dns_proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/pl/https-dns-proxy.po
diff --git a/applications/luci-app-https_dns_proxy/po/pt/https_dns_proxy.po b/applications/luci-app-https-dns-proxy/po/pt/https-dns-proxy.po
index 46843434d1..46843434d1 100644
--- a/applications/luci-app-https_dns_proxy/po/pt/https_dns_proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/pt/https-dns-proxy.po
diff --git a/applications/luci-app-https_dns_proxy/po/pt_BR/https_dns_proxy.po b/applications/luci-app-https-dns-proxy/po/pt_BR/https-dns-proxy.po
index e4ca92f55a..e4ca92f55a 100644
--- a/applications/luci-app-https_dns_proxy/po/pt_BR/https_dns_proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/pt_BR/https-dns-proxy.po
diff --git a/applications/luci-app-https_dns_proxy/po/ro/https_dns_proxy.po b/applications/luci-app-https-dns-proxy/po/ro/https-dns-proxy.po
index 6fb53c4595..6fb53c4595 100644
--- a/applications/luci-app-https_dns_proxy/po/ro/https_dns_proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/ro/https-dns-proxy.po
diff --git a/applications/luci-app-https_dns_proxy/po/ru/https_dns_proxy.po b/applications/luci-app-https-dns-proxy/po/ru/https-dns-proxy.po
index 7374688086..7374688086 100644
--- a/applications/luci-app-https_dns_proxy/po/ru/https_dns_proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/ru/https-dns-proxy.po
diff --git a/applications/luci-app-https_dns_proxy/po/sk/https_dns_proxy.po b/applications/luci-app-https-dns-proxy/po/sk/https-dns-proxy.po
index 5798c1c878..5798c1c878 100644
--- a/applications/luci-app-https_dns_proxy/po/sk/https_dns_proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/sk/https-dns-proxy.po
diff --git a/applications/luci-app-https_dns_proxy/po/sv/https_dns_proxy.po b/applications/luci-app-https-dns-proxy/po/sv/https-dns-proxy.po
index 002ae435ed..002ae435ed 100644
--- a/applications/luci-app-https_dns_proxy/po/sv/https_dns_proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/sv/https-dns-proxy.po
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
new file mode 100644
index 0000000000..6028db5141
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot
@@ -0,0 +1,165 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+#: luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
+msgid "AdGuard (Family Protection)"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
+msgid "AdGuard (Standard)"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
+msgid "CleanBrowsing (Adult Filter)"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
+msgid "CleanBrowsing (Family Filter)"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
+msgid "CleanBrowsing (Security Filter)"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
+msgid "Cloudflare"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
+msgid "DHCP and DNS"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
+msgid "DNS.SB"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+msgid "Digitale Gesellschaft"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
+msgid "Disable"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "DoH"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
+msgid "Enable"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
+msgid "For more information on different options check"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
+msgid "Google"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid "Instances"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
+msgid "Listen address"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
+msgid "Listen port"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
+msgid "Loading"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
+msgid "ODVR (nic.cz)"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
+msgid "Proxy server"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
+msgid "Quad 9 (Recommended)"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
+msgid "Quad 9 (Secured with ECS Support)"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
+msgid "Quad 9 (Secured)"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
+msgid "Quad 9 (Unsecured)"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
+msgid "Reload"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "Running"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
+msgid "Service Status"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
+msgid "Start"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
+msgid "Stop"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
+msgid "Stopped"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid ""
+"When you add/remove any instances below, they will be used to override the "
+"'DNS forwardings' section of"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
+msgid "and"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "at"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
+msgid "is not installed or not found"
+msgstr ""
+
+#: luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
diff --git a/applications/luci-app-https_dns_proxy/po/tr/https_dns_proxy.po b/applications/luci-app-https-dns-proxy/po/tr/https-dns-proxy.po
index c61c6f936b..c61c6f936b 100644
--- a/applications/luci-app-https_dns_proxy/po/tr/https_dns_proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/tr/https-dns-proxy.po
diff --git a/applications/luci-app-https_dns_proxy/po/uk/https_dns_proxy.po b/applications/luci-app-https-dns-proxy/po/uk/https-dns-proxy.po
index 4e4862c181..4e4862c181 100644
--- a/applications/luci-app-https_dns_proxy/po/uk/https_dns_proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/uk/https-dns-proxy.po
diff --git a/applications/luci-app-https_dns_proxy/po/vi/https_dns_proxy.po b/applications/luci-app-https-dns-proxy/po/vi/https-dns-proxy.po
index 244c5f7ed3..244c5f7ed3 100644
--- a/applications/luci-app-https_dns_proxy/po/vi/https_dns_proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/vi/https-dns-proxy.po
diff --git a/applications/luci-app-https_dns_proxy/po/zh-cn/https_dns_proxy.po b/applications/luci-app-https-dns-proxy/po/zh-cn/https-dns-proxy.po
index 19da1e0356..19da1e0356 100644
--- a/applications/luci-app-https_dns_proxy/po/zh-cn/https_dns_proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/zh-cn/https-dns-proxy.po
diff --git a/applications/luci-app-https_dns_proxy/po/zh-tw/https_dns_proxy.po b/applications/luci-app-https-dns-proxy/po/zh-tw/https-dns-proxy.po
index c4d40fca4b..c4d40fca4b 100644
--- a/applications/luci-app-https_dns_proxy/po/zh-tw/https_dns_proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/zh-tw/https-dns-proxy.po
diff --git a/applications/luci-app-https-dns-proxy/root/etc/uci-defaults/40_luci-https-dns-proxy b/applications/luci-app-https-dns-proxy/root/etc/uci-defaults/40_luci-https-dns-proxy
new file mode 100644
index 0000000000..a1ecfcea24
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/root/etc/uci-defaults/40_luci-https-dns-proxy
@@ -0,0 +1,3 @@
+#!/bin/sh
+rm -rf /var/luci-modulecache/; rm -f /var/luci-indexcache;
+exit 0
diff --git a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua b/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua
deleted file mode 100644
index 050549bf8d..0000000000
--- a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua
+++ /dev/null
@@ -1,14 +0,0 @@
---    .. "</br>"
---    .. translate("For more information on different options check ")
---		.. [[ <a href="https://adguard.com/en/adguard-dns/overview.html#instruction">]]
---    .. "AdGuard.com" .. [[</a>]] .. ", "
---		.. [[ <a href="https://cleanbrowsing.org/guides/dnsoverhttps">]]
---    .. "CleanBrowsing.org" .. [[</a>]] .. " " .. translate("and") .. " "
---		.. [[ <a href="https://www.quad9.net/doh-quad9-dns-servers/">]]
---    .. "Quad9.net" .. [[</a>]] .. "."
-return {
-	name = "AdGuard-Family",
-	label = _("AdGuard (Family Protection)"),
-	url_prefix = "https://dns-family.adguard.com/dns-query?ct&",
-	bootstrap_dns = "176.103.130.132,176.103.130.134"
-}
diff --git a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua b/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua
deleted file mode 100644
index 67b7c12811..0000000000
--- a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua
+++ /dev/null
@@ -1,14 +0,0 @@
---    .. "</br>"
---    .. translate("For more information on different options check ")
---		.. [[ <a href="https://adguard.com/en/adguard-dns/overview.html#instruction">]]
---    .. "AdGuard.com" .. [[</a>]] .. ", "
---		.. [[ <a href="https://cleanbrowsing.org/guides/dnsoverhttps">]]
---    .. "CleanBrowsing.org" .. [[</a>]] .. " " .. translate("and") .. " "
---		.. [[ <a href="https://www.quad9.net/doh-quad9-dns-servers/">]]
---    .. "Quad9.net" .. [[</a>]] .. "."
-return {
-	name = "AdGuard-Standard",
-	label = _("AdGuard (Standard)"),
-	url_prefix = "https://dns.adguard.com/dns-query?ct&",
-	bootstrap_dns = "176.103.130.130,176.103.130.131"
-}
diff --git a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua b/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua
deleted file mode 100644
index 356921a97f..0000000000
--- a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua
+++ /dev/null
@@ -1,14 +0,0 @@
---    .. "</br>"
---    .. translate("For more information on different options check ")
---		.. [[ <a href="https://adguard.com/en/adguard-dns/overview.html#instruction">]]
---    .. "AdGuard.com" .. [[</a>]] .. ", "
---		.. [[ <a href="https://cleanbrowsing.org/guides/dnsoverhttps">]]
---    .. "CleanBrowsing.org" .. [[</a>]] .. " " .. translate("and") .. " "
---		.. [[ <a href="https://www.quad9.net/doh-quad9-dns-servers/">]]
---    .. "Quad9.net" .. [[</a>]] .. "."
-return {
-	name = "Quad9-Recommended",
-	label = _("Quad 9 (Recommended)"),
-	url_prefix = "https://dns.quad9.net:5053/dns-query?",
-	bootstrap_dns = "9.9.9.9,149.112.112.112"
-}
diff --git a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua b/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua
deleted file mode 100644
index a031556e8d..0000000000
--- a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua
+++ /dev/null
@@ -1,14 +0,0 @@
---    .. "</br>"
---    .. translate("For more information on different options check ")
---		.. [[ <a href="https://adguard.com/en/adguard-dns/overview.html#instruction">]]
---    .. "AdGuard.com" .. [[</a>]] .. ", "
---		.. [[ <a href="https://cleanbrowsing.org/guides/dnsoverhttps">]]
---    .. "CleanBrowsing.org" .. [[</a>]] .. " " .. translate("and") .. " "
---		.. [[ <a href="https://www.quad9.net/doh-quad9-dns-servers/">]]
---    .. "Quad9.net" .. [[</a>]] .. "."
-return {
-	name = "Quad9-Unsecured",
-	label = _("Quad 9 (Unsecured)"),
-	url_prefix = "https://dns10.quad9.net:5053/dns-query?",
-	bootstrap_dns = "9.9.9.10,149.112.112.10"
-}
diff --git a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua b/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua
deleted file mode 100644
index 3b51978d25..0000000000
--- a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua
+++ /dev/null
@@ -1,14 +0,0 @@
---    .. "</br>"
---    .. translate("For more information on different options check ")
---		.. [[ <a href="https://adguard.com/en/adguard-dns/overview.html#instruction">]]
---    .. "AdGuard.com" .. [[</a>]] .. ", "
---		.. [[ <a href="https://cleanbrowsing.org/guides/dnsoverhttps">]]
---    .. "CleanBrowsing.org" .. [[</a>]] .. " " .. translate("and") .. " "
---		.. [[ <a href="https://www.quad9.net/doh-quad9-dns-servers/">]]
---    .. "Quad9.net" .. [[</a>]] .. "."
-return {
-	name = "Quad9-ECS",
-	label = _("Quad 9 (Secured with ECS Support)"),
-	url_prefix = "https://dns11.quad9.net:5053/dns-query?",
-	bootstrap_dns = "9.9.9.11,149.112.112.11"
-}
diff --git a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua b/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua
deleted file mode 100644
index c456a8dcdc..0000000000
--- a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua
+++ /dev/null
@@ -1,14 +0,0 @@
---    .. "</br>"
---    .. translate("For more information on different options check ")
---		.. [[ <a href="https://adguard.com/en/adguard-dns/overview.html#instruction">]]
---    .. "AdGuard.com" .. [[</a>]] .. ", "
---		.. [[ <a href="https://cleanbrowsing.org/guides/dnsoverhttps">]]
---    .. "CleanBrowsing.org" .. [[</a>]] .. " " .. translate("and") .. " "
---		.. [[ <a href="https://www.quad9.net/doh-quad9-dns-servers/">]]
---    .. "Quad9.net" .. [[</a>]] .. "."
-return {
-	name = "Quad9-Secured",
-	label = _("Quad 9 (Secured)"),
-	url_prefix = "https://dns9.quad9.net:5053/dns-query?",
-	bootstrap_dns = "9.9.9.9,149.112.112.9"
-}
diff --git a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua b/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua
deleted file mode 100644
index 708a39e958..0000000000
--- a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua
+++ /dev/null
@@ -1,14 +0,0 @@
---    .. "</br>"
---    .. translate("For more information on different options check ")
---		.. [[ <a href="https://adguard.com/en/adguard-dns/overview.html#instruction">]]
---    .. "AdGuard.com" .. [[</a>]] .. ", "
---		.. [[ <a href="https://cleanbrowsing.org/guides/dnsoverhttps">]]
---    .. "CleanBrowsing.org" .. [[</a>]] .. " " .. translate("and") .. " "
---		.. [[ <a href="https://www.quad9.net/doh-quad9-dns-servers/">]]
---    .. "Quad9.net" .. [[</a>]] .. "."
-return {
-	name = "CleanBrowsing-Adult",
-	label = _("CleanBrowsing (Adult Filter)"),
-	url_prefix = "https://doh.cleanbrowsing.org/doh/adult-filter/?ct&",
-	bootstrap_dns = "185.228.168.168"
-}
diff --git a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua b/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua
deleted file mode 100644
index f44ed43305..0000000000
--- a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua
+++ /dev/null
@@ -1,14 +0,0 @@
---    .. "</br>"
---    .. translate("For more information on different options check ")
---		.. [[ <a href="https://adguard.com/en/adguard-dns/overview.html#instruction">]]
---    .. "AdGuard.com" .. [[</a>]] .. ", "
---		.. [[ <a href="https://cleanbrowsing.org/guides/dnsoverhttps">]]
---    .. "CleanBrowsing.org" .. [[</a>]] .. " " .. translate("and") .. " "
---		.. [[ <a href="https://www.quad9.net/doh-quad9-dns-servers/">]]
---    .. "Quad9.net" .. [[</a>]] .. "."
-return {
-	name = "CleanBrowsing-Family",
-	label = _("CleanBrowsing (Family Filter)"),
-	url_prefix = "https://doh.cleanbrowsing.org/doh/family-filter/?ct&",
-	bootstrap_dns = "185.228.168.168"
-}
diff --git a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua b/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua
deleted file mode 100644
index e4a3bf4ac4..0000000000
--- a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua
+++ /dev/null
@@ -1,14 +0,0 @@
---    .. "</br>"
---    .. translate("For more information on different options check ")
---		.. [[ <a href="https://adguard.com/en/adguard-dns/overview.html#instruction">]]
---    .. "AdGuard.com" .. [[</a>]] .. ", "
---		.. [[ <a href="https://cleanbrowsing.org/guides/dnsoverhttps">]]
---    .. "CleanBrowsing.org" .. [[</a>]] .. " " .. translate("and") .. " "
---		.. [[ <a href="https://www.quad9.net/doh-quad9-dns-servers/">]]
---    .. "Quad9.net" .. [[</a>]] .. "."
-return {
-	name = "CleanBrowsing-Security",
-	label = _("CleanBrowsing (Security Filter)"),
-	url_prefix = "https://doh.cleanbrowsing.org/doh/security-filter/?ct&",
-	bootstrap_dns = "185.228.168.168"
-}
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
deleted file mode 100644
index 1808cd9acf..0000000000
--- a/applications/luci-app-https_dns_proxy/po/templates/https_dns_proxy.pot
+++ /dev/null
@@ -1,177 +0,0 @@
-msgid ""
-msgstr "Content-Type: text/plain; charset=UTF-8"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
-msgid "AdGuard (Family Protection)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
-msgid "AdGuard (Standard)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
-msgid "CleanBrowsing (Adult Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
-msgid "CleanBrowsing (Family Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
-msgid "CleanBrowsing (Security Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
-msgid "Cloudflare"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
-msgid "DHCP and DNS"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
-msgid "DNS.SB"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
-msgid "Digitale Gesellschaft"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
-msgid "Disable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "DoH"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
-msgid "Enable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
-msgid "For more information on different options check"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
-msgid "Google"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid "Instances"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
-msgid "Listen address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
-msgid "Listen port"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
-msgid "Loading"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
-msgid "ODVR (nic.cz)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
-msgid "Proxy server"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
-msgid "Quad 9 (Recommended)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
-msgid "Quad 9 (Secured with ECS Support)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
-msgid "Quad 9 (Secured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
-msgid "Quad 9 (Unsecured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
-msgid "Reload"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "Running"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
-msgid "Service Status"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
-msgid "Start"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
-msgid "Stop"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "Stopped"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid ""
-"When you add/remove any instances below, they will be used to override the "
-"'DNS forwardings' section of"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
-msgid "and"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "at"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
-msgid "is not installed or not found"
-msgstr ""
diff --git a/applications/luci-app-https_dns_proxy/root/etc/uci-defaults/40_luci-https_dns_proxy b/applications/luci-app-https_dns_proxy/root/etc/uci-defaults/40_luci-https_dns_proxy
deleted file mode 100644
index 7800af701e..0000000000
--- a/applications/luci-app-https_dns_proxy/root/etc/uci-defaults/40_luci-https_dns_proxy
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-uci -q batch <<-EOF >/dev/null
-	delete ucitrack.@https_dns_proxy[-1]
-	add ucitrack https_dns_proxy
-	set ucitrack.@template[-1].init=https_dns_proxy
-	commit ucitrack
-EOF
-
-rm -f /tmp/luci-indexcache
-exit 0