summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-app-https-dns-proxy/luasrc
diff options
context:
space:
mode:
Diffstat (limited to 'applications/luci-app-https-dns-proxy/luasrc')
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua27
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ca.dnscrypt.dns1.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ca.dnscrypt.dns2.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/app.tiar.doh.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/app.tiar.jp.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/ca.cira.canadianshield.family.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/ca.cira.canadianshield.private.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/ca.cira.canadianshield.protected.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/ch.digitale-gesellschaft.dns.lua9
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/ch.switch.dns.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cn.360.doh.lua6
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cn.edu.tsinghua.tuna.dns.lua6
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cn.rubyfish.dns.lua7
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/co.osxz.dns.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.ahadns.blitz.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.alidns.dns.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.blahdns.doh-ch.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.blahdns.doh-de.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.blahdns.doh-fi.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.blahdns.doh-jp.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.blahdns.doh-sg.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.family.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua9
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.security.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.family.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.malware-ads-social.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.malware-ads.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.malware.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.p0.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.p1.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.p2.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.p3.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.unfiltered.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.decloudus.dns.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.dnsforfamily.dns-doh.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.dnslify.doh.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.opendns.doh.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.opendns.familyshield.doh.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.pumplex.dns.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.rethinkdns.basic.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/de.dnsforge.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/fi.lelux.resolver-eu.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua6
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/gr.libredns.doh-ads.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/gr.libredns.doh.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/io.adguard-dns.dns-family.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/io.adguard-dns.dns-nonfiltering.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/io.adguard-dns.dns.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/io.nextdns.dns.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/io.seby.doh-2.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/jp.iij.dns.public.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/lu.restena.kaitain.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.au.doh.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.chi.doh.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.es.doh.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.in.doh.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.it.doh.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.la.doh.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.nl.doh.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.no.doh.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.ny.doh.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.pl.doh.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.applied-privacy.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.cfiec.dns.lua6
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ffmuc.doh.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.he.ordns.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.idnet.doh.lua6
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.mullvad.doh.adblocker.lua9
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.mullvad.doh.lua9
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/one.comss.dns.lua6
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/one.comss.east.dns.lua6
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.snopyta.dns.doh.fi.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/pub.doh.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/sb.dns.lua9
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/tw.twnic.dns.lua8
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua212
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm75
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/css.htm9
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm60
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/status-textarea.htm13
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/status.htm12
91 files changed, 0 insertions, 1070 deletions
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
deleted file mode 100644
index f7122df478..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua
+++ /dev/null
@@ -1,27 +0,0 @@
-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 HTTPS Proxy")).acl_depends = { "luci-app-https-dns-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 http = require "luci.http"
- local sys = require "luci.sys"
- local util = require "luci.util"
- if name == "start" then
- sys.init.start(packageName)
- elseif name == "action" then
- util.exec("/etc/init.d/" .. packageName .. " reload >/dev/null 2>&1")
- elseif name == "stop" then
- sys.init.stop(packageName)
- elseif name == "enable" then
- sys.init.enable(packageName)
- elseif name == "disable" then
- sys.init.disable(packageName)
- end
- http.prepare_content("text/plain")
- http.write("0")
-end
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
deleted file mode 100644
index 2fa9985592..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ca.dnscrypt.dns1.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index f31dd38a23..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ca.dnscrypt.dns2.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-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/https-dns-proxy/providers/app.tiar.doh.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/app.tiar.doh.lua
deleted file mode 100644
index e3d8d1e11f..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/app.tiar.doh.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "doh.tiar.app",
- label = _("Tiarap Public DNS - SG"),
- resolver_url = "https://doh.tiar.app/dns-query",
- bootstrap_dns = "174.138.21.128,2400:6180:0:d0::5f6e:4001",
- help_link = "https://tiarap.org/",
- help_link_text = "Tiarap.org"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/app.tiar.jp.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/app.tiar.jp.lua
deleted file mode 100644
index 06885628c5..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/app.tiar.jp.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "doh.tiar.jp",
- label = _("Tiarap Public DNS - JP"),
- resolver_url = "https://doh.tiar.jp/dns-query",
- bootstrap_dns = "172.104.93.80,2400:8902::f03c:91ff:feda:c514",
- help_link = "https://tiarap.org/",
- help_link_text = "Tiarap.org"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/ca.cira.canadianshield.family.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/ca.cira.canadianshield.family.lua
deleted file mode 100644
index dfe1af44c0..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/ca.cira.canadianshield.family.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "family.canadianshield.cira.ca",
- label = _("CIRA Canadian Shield (Family)"),
- resolver_url = "https://family.canadianshield.cira.ca/dns-query",
- bootstrap_dns = "149.112.121.30,149.112.122.30,2620:10A:80BB::30,2620:10A:80BC::30",
- help_link = "https://www.cira.ca/cybersecurity-services/canadian-shield/",
- help_link_text = "CIRA Canadian Shield"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/ca.cira.canadianshield.private.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/ca.cira.canadianshield.private.lua
deleted file mode 100644
index 5b37a9a4ca..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/ca.cira.canadianshield.private.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "private.canadianshield.cira.ca",
- label = _("CIRA Canadian Shield (Private)"),
- resolver_url = "https://private.canadianshield.cira.ca/dns-query",
- bootstrap_dns = "149.112.121.10,149.112.122.10,2620:10A:80BB::10,2620:10A:80BC::10",
- help_link = "https://www.cira.ca/cybersecurity-services/canadian-shield/",
- help_link_text = "CIRA Canadian Shield"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/ca.cira.canadianshield.protected.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/ca.cira.canadianshield.protected.lua
deleted file mode 100644
index 810f479bda..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/ca.cira.canadianshield.protected.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "protected.canadianshield.cira.ca",
- label = _("CIRA Canadian Shield (Protected)"),
- resolver_url = "https://protected.canadianshield.cira.ca/dns-query",
- bootstrap_dns = "149.112.121.20,149.112.122.20,2620:10A:80BB::20,2620:10A:80BC::20",
- help_link = "https://www.cira.ca/cybersecurity-services/canadian-shield/",
- help_link_text = "CIRA Canadian Shield"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/ch.digitale-gesellschaft.dns.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/ch.digitale-gesellschaft.dns.lua
deleted file mode 100644
index 3253cf49ea..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/ch.digitale-gesellschaft.dns.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-return {
- name = "dns.digitale-gesellschaft.ch",
- label = _("Digitale Gesellschaft - CH"),
- resolver_url = "https://dns.digitale-gesellschaft.ch/dns-query",
- bootstrap_dns = "1.1.1.1,1.0.0.1,2606:4700:4700::1111,2606:4700:4700::1001,8.8.8.8,8.8.4.4,2001:4860:4860::8888,2001:4860:4860::8844",
- http2_only = true,
- help_link = "https://www.digitale-gesellschaft.ch/dns/",
- help_link_text = "Digitale Gesellschaft"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/ch.switch.dns.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/ch.switch.dns.lua
deleted file mode 100644
index 9f0c594e0a..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/ch.switch.dns.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "dns.switch.ch",
- label = _("Switch DNS - CH"),
- resolver_url = "https://dns.switch.ch/dns-query",
- bootstrap_dns = "130.59.31.248,2001:620:0:ff::2",
- help_link = "https://www.switch.ch/security/info/public-dns/",
- help_link_text = "Switch.ch"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cn.360.doh.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cn.360.doh.lua
deleted file mode 100644
index f582a821ff..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cn.360.doh.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-return {
- name = "doh.360.cn",
- label = _("360 Secure DNS - CN"),
- resolver_url = "https://doh.360.cn/dns-query",
- bootstrap_dns = "101.226.4.6,218.30.118.6,123.125.81.6,140.207.198.6"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cn.edu.tsinghua.tuna.dns.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cn.edu.tsinghua.tuna.dns.lua
deleted file mode 100644
index 6e40de3b13..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cn.edu.tsinghua.tuna.dns.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-return {
- name = "dns.tuna.tsinghua.edu.cn",
- label = _("Tsinghua University Secure DNS - CN"),
- resolver_url = "https://dns.tuna.tsinghua.edu.cn:8443/dns-query",
- bootstrap_dns = "208.67.222.222,208.67.220.220",
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cn.rubyfish.dns.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cn.rubyfish.dns.lua
deleted file mode 100644
index b64bd9ceb8..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cn.rubyfish.dns.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-return {
- name = "dns.rubyfish.cn",
- label = _("rubyfish.cn"),
- resolver_url = "https://dns.rubyfish.cn/dns-query",
- bootstrap_dns = "1.1.1.1,1.0.0.1,2606:4700:4700::1111,2606:4700:4700::1001,8.8.8.8,8.8.4.4,2001:4860:4860::8888,2001:4860:4860::8844",
- http2_only = true
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/co.osxz.dns.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/co.osxz.dns.lua
deleted file mode 100644
index f54c912e7f..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/co.osxz.dns.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "dns.oszx.co",
- label = _("OSZX DNS - UK"),
- resolver_url = "https://dns.oszx.co/dns-query",
- bootstrap_dns = "51.38.83.141,2001:41d0:801:2000::d64",
- help_link = "https://dns.oszx.co/#mdoh",
- help_link_text = "OSZX.co"
-}
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
deleted file mode 100644
index 0c2a4d8156..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "dns-family.adguard.com",
- label = _("AdGuard (Family Protection)"),
- resolver_url = "https://dns-family.adguard.com/dns-query",
- bootstrap_dns = "176.103.130.132,176.103.130.134",
- help_link = "https://adguard.com/en/adguard-dns/overview.html",
- help_link_text = "AdGuard.com"
-}
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
deleted file mode 100644
index 79db2029dd..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "dns.adguard.com",
- label = _("AdGuard (Standard)"),
- resolver_url = "https://dns.adguard.com/dns-query",
- bootstrap_dns = "176.103.130.130,176.103.130.131",
- help_link = "https://adguard.com/en/adguard-dns/overview.html",
- help_link_text = "AdGuard.com"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.ahadns.blitz.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.ahadns.blitz.lua
deleted file mode 100644
index 5a67fcbdb7..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.ahadns.blitz.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "blitz.ahadns.com",
- label = _("AhaDNS Blitz (Configurable)"),
- resolver_url = "https://blitz.ahadns.com/",
- bootstrap_dns = "1.1.1.1,1.0.0.1,2606:4700:4700::1111,2606:4700:4700::1001,8.8.8.8,8.8.4.4,2001:4860:4860::8888,2001:4860:4860::8844",
- help_link = "https://blitz-setup.ahadns.com/",
- help_link_text = "AhaDNS Blitz"
-}
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
deleted file mode 100644
index 1654feab0b..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.alidns.dns.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name="dns.alidns.com",
- label=_("AliDNS - CN"),
- 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",
- help_link = "https://alidns.com/",
- help_link_text = "AliDNS.com"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.blahdns.doh-ch.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.blahdns.doh-ch.lua
deleted file mode 100644
index 8e22f59bb2..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.blahdns.doh-ch.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "doh-ch.blahdns.com",
- label = _("BlahDNS - CH"),
- resolver_url = "https://doh-ch.blahdns.com/dns-query",
- bootstrap_dns = "1.1.1.1,1.0.0.1,2606:4700:4700::1111,2606:4700:4700::1001,8.8.8.8,8.8.4.4,2001:4860:4860::8888,2001:4860:4860::8844",
- help_link = "https://blahdns.com/",
- help_link_text = "BlahDNS.com"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.blahdns.doh-de.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.blahdns.doh-de.lua
deleted file mode 100644
index d252c521ac..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.blahdns.doh-de.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "doh-de.blahdns.com",
- label = _("BlahDNS - DE"),
- resolver_url = "https://doh-de.blahdns.com/dns-query",
- bootstrap_dns = "1.1.1.1,1.0.0.1,2606:4700:4700::1111,2606:4700:4700::1001,8.8.8.8,8.8.4.4,2001:4860:4860::8888,2001:4860:4860::8844",
- help_link = "https://blahdns.com/",
- help_link_text = "BlahDNS.com"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.blahdns.doh-fi.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.blahdns.doh-fi.lua
deleted file mode 100644
index 75f01ed17c..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.blahdns.doh-fi.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "doh-fi.blahdns.com",
- label = _("BlahDNS - FI"),
- resolver_url = "https://doh-fi.blahdns.com/dns-query",
- bootstrap_dns = "1.1.1.1,1.0.0.1,2606:4700:4700::1111,2606:4700:4700::1001,8.8.8.8,8.8.4.4,2001:4860:4860::8888,2001:4860:4860::8844",
- help_link = "https://blahdns.com/",
- help_link_text = "BlahDNS.com"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.blahdns.doh-jp.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.blahdns.doh-jp.lua
deleted file mode 100644
index 3cb783d42e..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.blahdns.doh-jp.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "doh-jp.blahdns.com",
- label = _("BlahDNS - JP"),
- resolver_url = "https://doh-jp.blahdns.com/dns-query",
- bootstrap_dns = "1.1.1.1,1.0.0.1,2606:4700:4700::1111,2606:4700:4700::1001,8.8.8.8,8.8.4.4,2001:4860:4860::8888,2001:4860:4860::8844",
- help_link = "https://blahdns.com/",
- help_link_text = "BlahDNS.com"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.blahdns.doh-sg.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.blahdns.doh-sg.lua
deleted file mode 100644
index 32b684d261..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.blahdns.doh-sg.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "doh-sg.blahdns.com",
- label = _("BlahDNS - SG"),
- resolver_url = "https://doh-sg.blahdns.com/dns-query",
- bootstrap_dns = "1.1.1.1,1.0.0.1,2606:4700:4700::1111,2606:4700:4700::1001,8.8.8.8,8.8.4.4,2001:4860:4860::8888,2001:4860:4860::8844",
- help_link = "https://blahdns.com/",
- help_link_text = "BlahDNS.com"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.family.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.family.lua
deleted file mode 100644
index 69fe4d2d24..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.family.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "family.cloudflare-dns.com",
- label = _("Cloudflare (Family Protection)"),
- resolver_url = "https://family.cloudflare-dns.com/dns-query",
- bootstrap_dns = "1.1.1.3,1.0.0.3,2606:4700:4700::1113,2606:4700:4700::1003",
- help_link = "https://one.one.one.one/family/",
- help_link_text = "Cloudflare.com"
-}
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
deleted file mode 100644
index eb78366ac2..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-return {
- name = "cloudflare-dns.com",
- label = _("Cloudflare"),
- resolver_url = "https://cloudflare-dns.com/dns-query",
- bootstrap_dns = "1.1.1.1,1.0.0.1,2606:4700:4700::1111,2606:4700:4700::1001",
- help_link = "https://one.one.one.one/family/",
- help_link_text = "Cloudflare.com",
- default = true
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.security.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.security.lua
deleted file mode 100644
index 3013305bd5..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.security.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "security.cloudflare-dns.com",
- label = _("Cloudflare (Security Protection)"),
- resolver_url = "https://security.cloudflare-dns.com/dns-query",
- bootstrap_dns = "1.1.1.2,1.0.0.2,2606:4700:4700::1112,2606:4700:4700::1002",
- help_link = "https://one.one.one.one/family/",
- help_link_text = "Cloudflare.com"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.family.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.family.lua
deleted file mode 100644
index e7d6ffda93..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.family.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "freedns.controld.com-family",
- label = _("ControlD (Family)"),
- resolver_url = "https://freedns.controld.com/family",
- bootstrap_dns = "76.76.2.4,2606:1a40::4",
- help_link = "https://kb.controld.com/tutorials",
- help_link_text = "ControlD.com"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.malware-ads-social.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.malware-ads-social.lua
deleted file mode 100644
index 4b8ee02729..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.malware-ads-social.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "ControlD-Malware-Ads-Social",
- label = _("ControlD (Block Malware + Ads + Social)"),
- resolver_url = "https://freedns.controld.com/p3",
- bootstrap_dns = "76.76.2.3,2606:1a40::3",
- help_link = "https://kb.controld.com/tutorials",
- help_link_text = "ControlD"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.malware-ads.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.malware-ads.lua
deleted file mode 100644
index 947ed59a1c..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.malware-ads.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "ControlD-Malware-Ads",
- label = _("ControlD (Block Malware + Ads)"),
- resolver_url = "https://freedns.controld.com/p2",
- bootstrap_dns = "76.76.2.2,2606:1a40::2",
- help_link = "https://kb.controld.com/tutorials",
- help_link_text = "ControlD"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.malware.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.malware.lua
deleted file mode 100644
index 77f062b1b4..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.malware.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "ControlD-Malware",
- label = _("ControlD (Block Malware)"),
- resolver_url = "https://freedns.controld.com/p1",
- bootstrap_dns = "76.76.2.1,2606:1a40::1",
- help_link = "https://kb.controld.com/tutorials",
- help_link_text = "ControlD"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.p0.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.p0.lua
deleted file mode 100644
index a520c9694f..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.p0.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "freedns.controld.com-p0",
- label = _("ControlD (Unfiltered)"),
- resolver_url = "https://freedns.controld.com/p0",
- bootstrap_dns = "76.76.2.0,2606:1a40::0",
- help_link = "https://kb.controld.com/tutorials",
- help_link_text = "ControlD.com"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.p1.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.p1.lua
deleted file mode 100644
index eac144e92d..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.p1.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "freedns.controld.com-p1",
- label = _("ControlD (Block Malware)"),
- resolver_url = "https://freedns.controld.com/p1",
- bootstrap_dns = "76.76.2.1,2606:1a40::1",
- help_link = "https://kb.controld.com/tutorials",
- help_link_text = "ControlD.com"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.p2.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.p2.lua
deleted file mode 100644
index 0e7c846a6a..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.p2.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "freedns.controld.com-p2",
- label = _("ControlD (Block Malware + Ads)"),
- resolver_url = "https://freedns.controld.com/p2",
- bootstrap_dns = "76.76.2.2,2606:1a40::2",
- help_link = "https://kb.controld.com/tutorials",
- help_link_text = "ControlD.com"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.p3.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.p3.lua
deleted file mode 100644
index 0249678de0..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.p3.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "freedns.controld.com-p3",
- label = _("ControlD (Block Malware + Ads + Social)"),
- resolver_url = "https://freedns.controld.com/p3",
- bootstrap_dns = "76.76.2.3,2606:1a40::3",
- help_link = "https://kb.controld.com/tutorials",
- help_link_text = "ControlD.com"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.unfiltered.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.unfiltered.lua
deleted file mode 100644
index d4128df343..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.unfiltered.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "ControlD-Unfiltered",
- label = _("ControlD (Unfiltered)"),
- resolver_url = "https://freedns.controld.com/p0",
- bootstrap_dns = "76.76.2.0,2606:1a40::0",
- help_link = "https://kb.controld.com/tutorials",
- help_link_text = "ControlD"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.decloudus.dns.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.decloudus.dns.lua
deleted file mode 100644
index 1135c093d8..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.decloudus.dns.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "dns.decloudus.com",
- label = _("DeCloudUs DNS"),
- resolver_url = "https://dns.decloudus.com/dns-query",
- bootstrap_dns = "1.1.1.1,1.0.0.1,2606:4700:4700::1111,2606:4700:4700::1001,8.8.8.8,8.8.4.4,2001:4860:4860::8888,2001:4860:4860::8844",
- help_link = "https://decloudus.com/",
- help_link_text = "DeCloudUs.com"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.dnsforfamily.dns-doh.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.dnsforfamily.dns-doh.lua
deleted file mode 100644
index 41b63ffbd7..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.dnsforfamily.dns-doh.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "dnsforfamily",
- label = _("DNS For Family"),
- resolver_url = "https://dns-doh.dnsforfamily.com/dns-query",
- bootstrap_dns = "94.130.180.225,78.47.64.161",
- help_link = "https://dnsforfamily.com/#DNS_Servers_DNS_Over_HTTPS",
- help_link_text = "DNSForFamily.com"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.dnslify.doh.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.dnslify.doh.lua
deleted file mode 100644
index e531bcc8d4..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.dnslify.doh.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "doh.dnslify.com",
- label = _("DNSlify DNS"),
- resolver_url = "https://doh.dnslify.com/dns-query",
- bootstrap_dns = "185.235.81.1,185.235.81.2,2a0d:4d00:81::1,2a0d:4d00:81::2",
- help_link = "https://www.dnslify.com/services/doh/",
- help_link_text = "DNSlify.com"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.opendns.doh.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.opendns.doh.lua
deleted file mode 100644
index 16a833110f..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.opendns.doh.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "doh.opendns.com",
- label = _("OpenDNS"),
- resolver_url = "https://doh.opendns.com/dns-query",
- bootstrap_dns = "208.67.222.222,208.67.220.220",
- help_link = "https://support.opendns.com/hc/en-us/articles/360038086532-Using-DNS-over-HTTPS-DoH-with-OpenDNS",
- help_link_text = "OpenDNS.com"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.opendns.familyshield.doh.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.opendns.familyshield.doh.lua
deleted file mode 100644
index 8686d8c5f5..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.opendns.familyshield.doh.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "doh.familyshield.opendns.com",
- label = _("OpenDNS (Family Shield)"),
- resolver_url = "https://doh.familyshield.opendns.com/dns-query",
- bootstrap_dns = "208.67.222.123,208.67.220.123",
- help_link = "https://support.opendns.com/hc/en-us/articles/360038086532-Using-DNS-over-HTTPS-DoH-with-OpenDNS",
- help_link_text = "OpenDNS.com"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.pumplex.dns.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.pumplex.dns.lua
deleted file mode 100644
index b61630af26..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.pumplex.dns.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "dns.pumplex.com",
- label = _("OSZX DNS (Pumplex)"),
- resolver_url = "https://dns.pumplex.com/dns-query",
- bootstrap_dns = "51.38.82.198,2001:41d0:801:2000::1b28",
- help_link = "https://dns.oszx.co/#mdoh",
- help_link_text = "OSZX.co"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.rethinkdns.basic.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.rethinkdns.basic.lua
deleted file mode 100644
index 966ccd757a..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.rethinkdns.basic.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "basic.rethinkdns.com",
- label = _("Rethink DNS (Configurable)"),
- resolver_url = "https://basic.rethinkdns.com/",
- bootstrap_dns = "1.1.1.1,1.0.0.1,2606:4700:4700::1111,2606:4700:4700::1001,8.8.8.8,8.8.4.4,2001:4860:4860::8888,2001:4860:4860::8844",
- help_link = "https://www.rethinkdns.com/configure",
- help_link_text = "RethinkDNS.com"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua
deleted file mode 100644
index 5568fc7bbb..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "odvr.nic.cz",
- label = _("ODVR (nic.cz)"),
- resolver_url = "https://odvr.nic.cz/doh",
- bootstrap_dns = "193.17.47.1,185.43.135.1,2001:148f:ffff::1,2001:148f:fffe::1",
- help_link = "https://www.nic.cz/odvr/",
- help_link_text = "nic.cz"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/de.dnsforge.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/de.dnsforge.lua
deleted file mode 100644
index a6fe548fc1..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/de.dnsforge.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "dnsforge.de",
- label = _("DNS Forge - DE"),
- resolver_url = "https://dnsforge.de/dns-query",
- bootstrap_dns = "176.9.93.198,176.9.1.117,2a01:4f8:151:34aa::198,2a01:4f8:141:316d::117",
- help_link = "https://dnsforge.de/",
- help_link_text = "DNSForge.de"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/fi.lelux.resolver-eu.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/fi.lelux.resolver-eu.lua
deleted file mode 100644
index 5954ea78cf..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/fi.lelux.resolver-eu.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "resolver-eu.lelux.fi",
- label = _("Lelux DNS - FI"),
- resolver_url = "https://resolver-eu.lelux.fi/dns-query",
- bootstrap_dns = "1.1.1.1,1.0.0.1,2606:4700:4700::1111,2606:4700:4700::1001,8.8.8.8,8.8.4.4,2001:4860:4860::8888,2001:4860:4860::8844",
- help_link = "https://lelux.fi/resolver/",
- help_link_text = "Lelux.fi"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua
deleted file mode 100644
index a23e9e5318..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-return {
- name = "dns.google",
- label = _("Google"),
- resolver_url = "https://dns.google/dns-query",
- bootstrap_dns = "8.8.8.8,8.8.4.4,2001:4860:4860::8888,2001:4860:4860::8844"
-}
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
deleted file mode 100644
index 63e4290f00..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/gr.libredns.doh-ads.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "doh.libredns.gr-ads",
- label = _("LibreDNS - GR (No Ads)"),
- resolver_url = "https://doh.libredns.gr/ads",
- bootstrap_dns = "116.202.176.26,1.1.1.1",
- help_link = "https://libredns.gr/",
- help_link_text = "LibreDNS.gr"
-}
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
deleted file mode 100644
index 67f9e5ffd7..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/gr.libredns.doh.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "doh.libredns.gr",
- label = _("LibreDNS - GR"),
- resolver_url = "https://doh.libredns.gr/dns-query",
- bootstrap_dns = "116.202.176.26,1.1.1.1",
- help_link = "https://libredns.gr/",
- help_link_text = "LibreDNS.gr"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/io.adguard-dns.dns-family.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/io.adguard-dns.dns-family.lua
deleted file mode 100644
index eecb562da7..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/io.adguard-dns.dns-family.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "dns-family.adguard.com",
- label = _("AdGuard (Family Protection)"),
- resolver_url = "https://dns-family.adguard.com/dns-query",
- bootstrap_dns = "94.140.14.140,94.140.14.141,2a10:50c0::1:ff,2a10:50c0::2:ff",
- help_link = "https://adguard-dns.io/en/public-dns.html",
- help_link_text = "AdGuard.com"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/io.adguard-dns.dns-nonfiltering.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/io.adguard-dns.dns-nonfiltering.lua
deleted file mode 100644
index cfa938db83..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/io.adguard-dns.dns-nonfiltering.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "dns-unfiltered.adguard.com",
- label = _("AdGuard (Non-filtering)"),
- resolver_url = "https://dns-unfiltered.adguard.com/dns-query",
- bootstrap_dns = "94.140.14.140,94.140.14.141,2a10:50c0::1:ff,2a10:50c0::2:ff",
- help_link = "https://adguard-dns.io/en/public-dns.html",
- help_link_text = "AdGuard.com"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/io.adguard-dns.dns.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/io.adguard-dns.dns.lua
deleted file mode 100644
index 90269504e0..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/io.adguard-dns.dns.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "dns.adguard.com",
- label = _("AdGuard (Standard)"),
- resolver_url = "https://dns.adguard.com/dns-query",
- bootstrap_dns = "94.140.14.140,94.140.14.141,2a10:50c0::1:ff,2a10:50c0::2:ff",
- help_link = "https://adguard-dns.io/en/public-dns.html",
- help_link_text = "AdGuard.com"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/io.nextdns.dns.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/io.nextdns.dns.lua
deleted file mode 100644
index 53aca92edd..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/io.nextdns.dns.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "dns.nextdns.io",
- label = _("NextDNS.io (Configurable)"),
- resolver_url = "https://dns.nextdns.io/",
- bootstrap_dns = "45.90.28.49,45.90.30.49",
- help_link = " https://my.nextdns.io",
- help_link_text = "NextDNS.io"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/io.seby.doh-2.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/io.seby.doh-2.lua
deleted file mode 100644
index 6746e50573..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/io.seby.doh-2.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "doh-2.seby.io",
- label = _("Seby DNS - AU"),
- resolver_url = "https://doh-2.seby.io/dns-query",
- bootstrap_dns = "45.76.113.31,139.99.222.72",
- help_link = "https://dns.seby.io/",
- help_link_text = "Seby.io"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/jp.iij.dns.public.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/jp.iij.dns.public.lua
deleted file mode 100644
index bd7660e116..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/jp.iij.dns.public.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "public.dns.iij.jp",
- label = _("IIJ Public DNS - JP"),
- resolver_url = "https://public.dns.iij.jp/dns-query",
- bootstrap_dns = "1.1.1.1,1.0.0.1,2606:4700:4700::1111,2606:4700:4700::1001,8.8.8.8,8.8.4.4,2001:4860:4860::8888,2001:4860:4860::8844",
- help_link = "https://www.iij.ad.jp/",
- help_link_text = "IIJ.ad.jp"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/lu.restena.kaitain.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/lu.restena.kaitain.lua
deleted file mode 100644
index 474a47bdaa..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/lu.restena.kaitain.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "kaitain.restena.lu",
- label = _("Restena DNS - LU"),
- resolver_url = "https://kaitain.restena.lu/dns-query",
- bootstrap_dns = "1.1.1.1,1.0.0.1,2606:4700:4700::1111,2606:4700:4700::1001,8.8.8.8,8.8.4.4,2001:4860:4860::8888,2001:4860:4860::8844",
- help_link = "https://www.restena.lu/en/service/public-dns-resolver",
- help_link_text = "Restena.lu"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.au.doh.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.au.doh.lua
deleted file mode 100644
index 4105111cf9..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.au.doh.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "doh.au.ahadns.net",
- label = _("AhaDNS - AU (Block Malware + Ads)"),
- resolver_url = "https://doh.au.ahadns.net/dns-query",
- bootstrap_dns = "185.213.26.187,45.67.219.208,5.2.75.75,45.79.120.233,2a0d:5600:33:3::3,2a04:bdc7:100:70::70,2a04:52c0:101:75::75,2400:8904:e001:43::43",
- help_link = "https://ahadns.com/dns-over-https/",
- help_link_text = "AhaDNS.com"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.chi.doh.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.chi.doh.lua
deleted file mode 100644
index 382893edcc..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.chi.doh.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "doh.chi.ahadns.net",
- label = _("AhaDNS - US/Chicago (Block Malware + Ads)"),
- resolver_url = "https://doh.chi.ahadns.net/dns-query",
- bootstrap_dns = "185.213.26.187,45.67.219.208,5.2.75.75,45.79.120.233,2a0d:5600:33:3::3,2a04:bdc7:100:70::70,2a04:52c0:101:75::75,2400:8904:e001:43::43",
- help_link = "https://ahadns.com/dns-over-https/",
- help_link_text = "AhaDNS.com"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.es.doh.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.es.doh.lua
deleted file mode 100644
index 3ebbcc43c1..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.es.doh.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "doh.es.ahadns.net",
- label = _("AhaDNS - ES (Block Malware + Ads)"),
- resolver_url = "https://doh.es.ahadns.net/dns-query",
- bootstrap_dns = "185.213.26.187,45.67.219.208,5.2.75.75,45.79.120.233,2a0d:5600:33:3::3,2a04:bdc7:100:70::70,2a04:52c0:101:75::75,2400:8904:e001:43::43",
- help_link = "https://ahadns.com/dns-over-https/",
- help_link_text = "AhaDNS.com"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.in.doh.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.in.doh.lua
deleted file mode 100644
index c2a128e2fd..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.in.doh.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "doh.in.ahadns.net",
- label = _("AhaDNS - IN (Block Malware + Ads)"),
- resolver_url = "https://doh.in.ahadns.net/dns-query",
- bootstrap_dns = "185.213.26.187,45.67.219.208,5.2.75.75,45.79.120.233,2a0d:5600:33:3::3,2a04:bdc7:100:70::70,2a04:52c0:101:75::75,2400:8904:e001:43::43",
- help_link = "https://ahadns.com/dns-over-https/",
- help_link_text = "AhaDNS.com"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.it.doh.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.it.doh.lua
deleted file mode 100644
index 7c2d1a51c7..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.it.doh.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "doh.it.ahadns.net",
- label = _("AhaDNS - IT (Block Malware + Ads)"),
- resolver_url = "https://doh.it.ahadns.net/dns-query",
- bootstrap_dns = "185.213.26.187,45.67.219.208,5.2.75.75,45.79.120.233,2a0d:5600:33:3::3,2a04:bdc7:100:70::70,2a04:52c0:101:75::75,2400:8904:e001:43::43",
- help_link = "https://ahadns.com/dns-over-https/",
- help_link_text = "AhaDNS.com"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.la.doh.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.la.doh.lua
deleted file mode 100644
index 7d643cfa24..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.la.doh.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "doh.la.ahadns.net",
- label = _("AhaDNS - US/Los Angeles (Block Malware + Ads)"),
- resolver_url = "https://doh.la.ahadns.net/dns-query",
- bootstrap_dns = "185.213.26.187,45.67.219.208,5.2.75.75,45.79.120.233,2a0d:5600:33:3::3,2a04:bdc7:100:70::70,2a04:52c0:101:75::75,2400:8904:e001:43::43",
- help_link = "https://ahadns.com/dns-over-https/",
- help_link_text = "AhaDNS.com"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.nl.doh.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.nl.doh.lua
deleted file mode 100644
index ce709d1520..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.nl.doh.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "doh.nl.ahadns.net",
- label = _("AhaDNS - NL (Block Malware + Ads)"),
- resolver_url = "https://doh.nl.ahadns.net/dns-query",
- bootstrap_dns = "185.213.26.187,45.67.219.208,5.2.75.75,45.79.120.233,2a0d:5600:33:3::3,2a04:bdc7:100:70::70,2a04:52c0:101:75::75,2400:8904:e001:43::43",
- help_link = "https://ahadns.com/dns-over-https/",
- help_link_text = "AhaDNS.com"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.no.doh.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.no.doh.lua
deleted file mode 100644
index d89ccfb572..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.no.doh.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "doh.no.ahadns.net",
- label = _("AhaDNS - NO (Block Malware + Ads)"),
- resolver_url = "https://doh.no.ahadns.net/dns-query",
- bootstrap_dns = "185.213.26.187,45.67.219.208,5.2.75.75,45.79.120.233,2a0d:5600:33:3::3,2a04:bdc7:100:70::70,2a04:52c0:101:75::75,2400:8904:e001:43::43",
- help_link = "https://ahadns.com/dns-over-https/",
- help_link_text = "AhaDNS.com"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.ny.doh.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.ny.doh.lua
deleted file mode 100644
index 6451ae9109..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.ny.doh.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "doh.ny.ahadns.net",
- label = _("AhaDNS - US/New York (Block Malware + Ads)"),
- resolver_url = "https://doh.ny.ahadns.net/dns-query",
- bootstrap_dns = "185.213.26.187,45.67.219.208,5.2.75.75,45.79.120.233,2a0d:5600:33:3::3,2a04:bdc7:100:70::70,2a04:52c0:101:75::75,2400:8904:e001:43::43",
- help_link = "https://ahadns.com/dns-over-https/",
- help_link_text = "AhaDNS.com"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.pl.doh.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.pl.doh.lua
deleted file mode 100644
index f5563a5937..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.pl.doh.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "doh.pl.ahadns.net",
- label = _("AhaDNS - PL (Block Malware + Ads)"),
- resolver_url = "https://doh.pl.ahadns.net/dns-query",
- bootstrap_dns = "185.213.26.187,45.67.219.208,5.2.75.75,45.79.120.233,2a0d:5600:33:3::3,2a04:bdc7:100:70::70,2a04:52c0:101:75::75,2400:8904:e001:43::43",
- help_link = "https://ahadns.com/dns-over-https/",
- help_link_text = "AhaDNS.com"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.applied-privacy.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.applied-privacy.lua
deleted file mode 100644
index 11f738cc48..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.applied-privacy.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "doh.applied-privacy.net",
- label = _("Applied Privacy DNS - AT/DE"),
- resolver_url = "https://doh.applied-privacy.net/query",
- bootstrap_dns = "1.1.1.1,1.0.0.1,2606:4700:4700::1111,2606:4700:4700::1001,8.8.8.8,8.8.4.4,2001:4860:4860::8888,2001:4860:4860::8844",
- help_link = "https://applied-privacy.net/services/dns/",
- help_link_text = "Applied-Privacy.net"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.cfiec.dns.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.cfiec.dns.lua
deleted file mode 100644
index d64f5c085a..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.cfiec.dns.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-return {
- name = "dns.cfiec.net",
- label = _("CFIEC Public DNS (IPv6 Only)"),
- resolver_url = "https://dns.cfiec.net/dns-query",
- bootstrap_dns = "240C::6666,240C::6644"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ffmuc.doh.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ffmuc.doh.lua
deleted file mode 100644
index 83582082c0..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ffmuc.doh.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "doh.ffmuc.net",
- label = _("FFMUC DNS - DE"),
- resolver_url = "https://doh.ffmuc.net/dns-query",
- bootstrap_dns = "1.1.1.1,1.0.0.1,2606:4700:4700::1111,2606:4700:4700::1001,8.8.8.8,8.8.4.4,2001:4860:4860::8888,2001:4860:4860::8844",
- help_link = "https://ffmuc.net/wiki/doku.php?id=knb:dohdot",
- help_link_text = "FFMUC.net"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.he.ordns.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.he.ordns.lua
deleted file mode 100644
index 24a4f40763..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.he.ordns.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "ordns.he.net",
- label = _("Hurricane Electric"),
- resolver_url = "https://ordns.he.net/dns-query",
- bootstrap_dns = "74.82.42.42,2001:470:20::2",
- help_link = "https://forums.he.net/index.php?topic=3996.0",
- help_link_text = "he.net"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.idnet.doh.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.idnet.doh.lua
deleted file mode 100644
index 9213b9988d..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.idnet.doh.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-return{
- name = "doh.idnet.net",
- label = _("IDNet.net - UK"),
- resolver_url = "https://doh.idnet.net/dns-query",
- bootstrap_dns = "212.69.36.23,212.69.40.23"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.mullvad.doh.adblocker.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.mullvad.doh.adblocker.lua
deleted file mode 100644
index f5a37fa4a8..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.mullvad.doh.adblocker.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-return {
- name="adblock.doh.mullvad.net",
- label=_("Mullvad (AdBlock)"),
- resolver_url="https://adblock.doh.mullvad.net/dns-query",
- bootstrap_dns="1.1.1.1,1.0.0.1,2606:4700:4700::1111,2606:4700:4700::1001,8.8.8.8,8.8.4.4,2001:4860:4860::8888,2001:4860:4860::8844",
- help_link="https://mullvad.net/en/help/dns-over-https-and-dns-over-tls/",
- help_link_text="Mullvad.net",
- http2_only = true
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.mullvad.doh.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.mullvad.doh.lua
deleted file mode 100644
index 2857f642d2..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.mullvad.doh.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-return {
- name="doh.mullvad.net",
- label=_("Mullvad"),
- resolver_url="https://doh.mullvad.net/dns-query",
- bootstrap_dns="1.1.1.1,1.0.0.1,2606:4700:4700::1111,2606:4700:4700::1001,8.8.8.8,8.8.4.4,2001:4860:4860::8888,2001:4860:4860::8844",
- help_link="https://mullvad.net/en/help/dns-over-https-and-dns-over-tls/",
- help_link_text="Mullvad.net",
- http2_only = 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
deleted file mode 100644
index c627be3d68..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "dns.quad9.net",
- label = _("Quad 9 (Recommended)"),
- resolver_url = "https://dns.quad9.net/dns-query",
- bootstrap_dns = "9.9.9.9,149.112.112.112,2620:fe::fe,2620:fe::9",
- help_link = "https://www.quad9.net/doh-quad9-dns-servers/",
- help_link_text = "Quad9.net"
-}
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
deleted file mode 100644
index 7abbdc4efc..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "dns10.quad9.net",
- label = _("Quad 9 (Unsecured)"),
- resolver_url = "https://dns10.quad9.net/dns-query",
- bootstrap_dns = "9.9.9.10,149.112.112.10,2620:fe::10,2620:fe::fe:10",
- help_link = "https://www.quad9.net/doh-quad9-dns-servers/",
- help_link_text = "Quad9.net"
-}
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
deleted file mode 100644
index 7e7dcdd56c..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "dns11.quad9.net",
- 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,2620:fe::11,2620:fe::fe:11",
- help_link = "https://www.quad9.net/doh-quad9-dns-servers/",
- help_link_text = "Quad9.net"
-}
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
deleted file mode 100644
index 6c2994ab41..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "dns9.quad9.net",
- label = _("Quad 9 (Secured)"),
- resolver_url = "https://dns9.quad9.net/dns-query",
- bootstrap_dns = "9.9.9.9,149.112.112.9,2620:fe::fe,2620:fe::9",
- help_link = "https://www.quad9.net/doh-quad9-dns-servers/",
- help_link_text = "Quad9.net"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/one.comss.dns.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/one.comss.dns.lua
deleted file mode 100644
index fe42ae3014..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/one.comss.dns.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-return {
- name = "dns.comss.one",
- label = _("Comss.ru DNS (West)"),
- resolver_url = "https://dns.comss.one/dns-query",
- bootstrap_dns = "92.38.152.163,93.115.24.204,2a03:90c0:56::1a5,2a02:7b40:5eb0:e95d::1"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/one.comss.east.dns.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/one.comss.east.dns.lua
deleted file mode 100644
index 9aff7f23df..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/one.comss.east.dns.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-return {
- name = "dns.east.comss.one",
- label = _("Comss.ru DNS (East)"),
- resolver_url = "https://dns.east.comss.one/dns-query",
- bootstrap_dns = "92.223.109.31,91.230.211.67,2a03:90c0:b5::1a,2a04:2fc0:39::47"
-}
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
deleted file mode 100644
index 09b3e250b7..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "doh.cleanbrowsing.org-doh-adult-filter",
- label = _("CleanBrowsing (Adult Filter)"),
- resolver_url = "https://doh.cleanbrowsing.org/doh/adult-filter/",
- bootstrap_dns = "185.228.168.168,1.1.1.1",
- help_link = "https://cleanbrowsing.org/guides/dnsoverhttps",
- help_link_text = "CleanBrowsing.org"
-}
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
deleted file mode 100644
index cd55277978..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "doh.cleanbrowsing.org-doh-family-filter",
- label = _("CleanBrowsing (Family Filter)"),
- resolver_url = "https://doh.cleanbrowsing.org/doh/family-filter/",
- bootstrap_dns = "185.228.168.168,1.1.1.1",
- help_link = "https://cleanbrowsing.org/guides/dnsoverhttps",
- help_link_text = "CleanBrowsing.org"
-}
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
deleted file mode 100644
index 339a0c2361..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "doh.cleanbrowsing.org-doh-security-filter",
- label = _("CleanBrowsing (Security Filter)"),
- resolver_url = "https://doh.cleanbrowsing.org/doh/security-filter/",
- bootstrap_dns = "185.228.168.168,1.1.1.1",
- help_link = "https://cleanbrowsing.org/guides/dnsoverhttps",
- help_link_text = "CleanBrowsing.org"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.snopyta.dns.doh.fi.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.snopyta.dns.doh.fi.lua
deleted file mode 100644
index b89b27da91..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.snopyta.dns.doh.fi.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "fi.doh.dns.snopyta.org",
- label = _("Snopyta DNS - FI"),
- resolver_url = "https://fi.doh.dns.snopyta.org/dns-query",
- bootstrap_dns = "1.1.1.1,1.0.0.1,2606:4700:4700::1111,2606:4700:4700::1001,8.8.8.8,8.8.4.4,2001:4860:4860::8888,2001:4860:4860::8844",
- help_link = "https://snopyta.org/service/dns/",
- help_link_text = "Snopyta.org"
-}
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
deleted file mode 100644
index 1dfee88707..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/pub.doh.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return{
- name = "doh.pub",
- label = _("DNSPod Public DNS - CN"),
- resolver_url = "https://doh.pub/dns-query",
- bootstrap_dns = "119.29.29.29,119.28.28.28",
- help_link = "https://www.dnspod.com/Products/Public.DNS",
- help_link_text = "DNSPod.com"
-}
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/sb.dns.lua
deleted file mode 100644
index 5b23d3dd46..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/sb.dns.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-return {
- name = "doh.dns.sb",
- label = _("DNS.SB"),
- resolver_url = "https://doh.dns.sb/dns-query",
- bootstrap_dns = "185.222.222.222,185.184.222.222",
- http2_only = true,
- help_link = "https://dns.sb/doh/",
- help_link_text = "DNS.sb"
-}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/tw.twnic.dns.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/tw.twnic.dns.lua
deleted file mode 100644
index 628dd8be57..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/tw.twnic.dns.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- name = "dns.twnic.tw",
- label = _("Quad 101 - TW"),
- resolver_url = "https://dns.twnic.tw/dns-query",
- bootstrap_dns = "101.101.101.101,101.102.103.104,2001:de4::101,2001:de4::102",
- help_link = "https://blog.twnic.tw/2018/12/28/1803/",
- help_link_text = "TWNIC.tw"
-}
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
deleted file mode 100644
index 8fa613a3d5..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua
+++ /dev/null
@@ -1,212 +0,0 @@
-local sys = require "luci.sys"
-local util = require "luci.util"
-local fs = require "nixio.fs"
-local dispatcher = require "luci.dispatcher"
-local i18n = require "luci.i18n"
-local uci = require("luci.model.uci").cursor()
-
-local packageName = "https-dns-proxy"
-local readmeURL = "https://docs.openwrt.melmac.net/" .. packageName .. "/"
-local providers_dir = "/usr/lib/lua/luci/" .. packageName .. "/providers/"
-local helperText = ""
-local http2Supported = false
-
-function getPackageVersion()
- local opkgFile = "/usr/lib/opkg/status"
- local line
- local flag = false
- for line in io.lines(opkgFile) do
- if flag then
- return line:match('[%d%.$-]+') or ""
- elseif line:find("Package: " .. packageName:gsub("%-", "%%%-")) then
- flag = true
- end
- end
- return ""
-end
-
-function createHelperText()
- local initText = translate("For more information on different options check") .. " "
- for filename in fs.dir(providers_dir) do
- local p_func = loadfile(providers_dir .. filename)
- setfenv(p_func, { _ = i18n.translate })
- local p = p_func()
- if p.help_link and (not p.http2_only or http2Supported) then
- local url, domain
- url = p.help_link
- domain = p.help_link_text or url:match('^%w+://([^/]+)')
- if not helperText:find(domain) then
- if helperText == "" then
- helperText = initText
- else
- helperText = helperText .. ", "
- end
- helperText = helperText .. [[<a href="]] .. url .. [[" target="_blank">]] .. domain .. [[</a>]]
- end
- end
- end
- if helperText ~= "" then
- local a = helperText:gsub('(.*),%s.*$', '%1')
- helperText = a .. " " .. translate("and") .. helperText:sub(#a + 2) .. "."
- end
-end
-
-function getProviderName(value)
- for filename in fs.dir(providers_dir) do
- local p_func = loadfile(providers_dir .. filename)
- setfenv(p_func, { _ = i18n.translate })
- local p = p_func()
- value = value: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("Unknown Provider")
-end
-
-local packageStatus, packageStatusCode
-local ubusStatus = util.ubus("service", "list", { name = packageName })
-local packageVersion = getPackageVersion()
-
-if packageVersion == "" then
- packageStatusCode, packageStatus = -1, translatef("%s is not installed or not found", packageName)
-else
- packageStatusCode, packageStatus = 1, ""
- for n = 1,20 do
- if ubusStatus and ubusStatus[packageName] and
- ubusStatus[packageName]["instances"] and
- ubusStatus[packageName]["instances"]["instance" .. n] and
- ubusStatus[packageName]["instances"]["instance" .. n]["running"] then
- local value, k, v, url, url_flag, la, la_flag, lp, lp_flag
- for k, v in pairs(ubusStatus[packageName]["instances"]["instance" .. n]["command"]) do
- if la_flag then la, la_flag = v, false end
- if lp_flag then lp, lp_flag = v, false end
- if url_flag then url, url_flag = v, false end
- if v == "-a" then la_flag = true end
- if v == "-p" then lp_flag = true end
- if v == "-r" then url_flag = true end
- end
- la = la or "127.0.0.1"
- lp = lp or n + 5053
- packageStatus = packageStatus .. translatef("%s DoH at %s:%s", getProviderName(url), la, lp) .. "\n"
- else
- break
- end
- end
- if packageStatus == "" then
- packageStatusCode = 0
- packageStatus = translate("Stopped")
- if not sys.init.enabled(packageName) then
- packageStatus = packageStatus .. " (" .. translate("disabled") .. ")"
- end
- end
-end
-
-if sys.call("grep -q 'Provides: libnghttp2' /usr/lib/opkg/status") == 0 then
- http2Supported = true
-end
-
-m = Map("https-dns-proxy", translate("DNS HTTPS Proxy Settings"))
-
-h = m:section(TypedSection, "_dummy", translatef("Service Status [%s %s]", packageName, packageVersion))
-h.template = "cbi/nullsection"
-ss = h:option(DummyValue, "_dummy", translate("Service Status"))
-ss.template = packageName .. "/status"
-ss.value = packageStatus
-if packageStatusCode ~= -1 then
- buttons = h:option(DummyValue, "_dummy", translate("Service Control"))
- buttons.template = packageName .. "/buttons"
-end
-
-c = m:section(NamedSection, "config", "https-dns-proxy", translate("Configuration"))
-d1 = c:option(ListValue, "dnsmasq_config_update", translate("Update DNSMASQ Config on Start/Stop"), translatef("If update option is selected, the 'DNS forwardings' section of %sDHCP and DNS%s will be automatically updated to use selected DoH providers (%smore information%s).", "<a href=\"" .. dispatcher.build_url("admin/network/dhcp") .. "\">", "</a>", "<a href=\"" .. readmeURL .. "#default-settings" .. "\" target=\"_blank\">", "</a>"))
-d1:value('*', translate("Update all configs"))
-local dnsmasq_num = 0
-uci:foreach("dhcp", "dnsmasq", function(s)
-d1:value(tostring(dnsmasq_num), translatef("Update %s config", "dhcp.@dnsmasq[" .. tostring(dnsmasq_num) .. "]"))
-dnsmasq_num = dnsmasq_num + 1
-end)
-d1:value('-', translate("Do not update configs"))
-d1.default = '*'
-f1 = c:option(ListValue, "force_dns", translate("Force Router DNS"), translate("Forces Router DNS use on local devices, also known as DNS Hijacking."))
-f1:value("0", translate("Let local devices use their own DNS servers if set"))
-f1:value("1", translate("Force Router DNS server to all local devices"))
-f1.default = "1"
-cdi = c:option(ListValue, "canary_domains_icloud", translate("Canary Domains iCloud"), translatef("Blocks access to iCloud Private Relay resolvers, forcing local devices to use router for DNS resolution (%smore information%s).", "<a href=\"" .. readmeURL .. "#canary_domains_icloud" .. "\" target=\"_blank\">", "</a>"))
-cdi:value("0", translate("Let local devices use iCloud Private Relay"))
-cdi:value("1", translate("Force Router DNS server to all local devices"))
-cdi:depends({force_dns="1"})
-cdi.default = "1"
-cdm = c:option(ListValue, "canary_domains_mozilla", translate("Canary Domains Mozilla"), translatef("Blocks access to Mozilla resolvers, forcing local devices to use router for DNS resolution (%smore information%s).", "<a href=\"" .. readmeURL .. "#canary_domains_mozilla" .. "\" target=\"_blank\">", "</a>"))
-cdm:value("0", translate("Let local devices use Mozilla resolvers"))
-cdm:value("1", translate("Force Router DNS server to all local devices"))
-cdm:depends({force_dns="1"})
-cdm.default = "1"
-
-createHelperText()
-s3 = m:section(TypedSection, "https-dns-proxy", translate("Instances"),
- helperText)
-s3.template = "cbi/tblsection"
-s3.sortable = false
-s3.anonymous = true
-s3.addremove = true
-
-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()
- if not p.http2_only or http2Supported then
- prov:value(p.resolver_url, p.label)
- end
- if p.default then
- prov.default = p.resolver_url
- end
-end
-prov.forcewrite = true
-prov.write = function(self, section, value)
- if not value then return end
- for filename in fs.dir(providers_dir) do
- local p_func = loadfile(providers_dir .. filename)
- setfenv(p_func, { _ = i18n.translate })
- local p = p_func()
- value = value:gsub('[%p%c%s]', '')
- p.url_match = p.resolver_url:gsub('[%p%c%s]', '')
- if value:match(p.url_match) then
- if p.bootstrap_dns then
- uci:set(packageName, section, "bootstrap_dns", p.bootstrap_dns)
- end
- if p.resolver_url then
- uci:set(packageName, section, "resolver_url", p.resolver_url)
- end
- end
- end
- uci:save(packageName)
-end
-
-la = s3:option(Value, "listen_addr", translate("Listen Address"))
-la.datatype = "host"
-la.placeholder = "127.0.0.1"
-la.rmempty = true
-
-local n = 0
-uci:foreach(packageName, packageName, function(s)
- if s[".name"] == section then
- return false
- end
- n = n + 1
-end)
-
-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
-
-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
deleted file mode 100644
index 6fd7ebd355..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm
+++ /dev/null
@@ -1,75 +0,0 @@
-<%# Copyright 2020 Stan Grishin <stangri@melmac.ca> -%>
-
-<%+https-dns-proxy/css%>
-<%+https-dns-proxy/js%>
-
-<%-
- local packageName = "https-dns-proxy"
- local serviceRunning, serviceEnabled = false, false;
-
- serviceEnabled = luci.sys.init.enabled(packageName)
- local ubusStatus = luci.util.ubus("service", "list", { name = packageName })
- if ubusStatus and ubusStatus[packageName] then
- serviceRunning = true
- end
-
- if serviceEnabled then
- btn_start_status = true
- btn_action_status = true
- btn_stop_status = true
- btn_enable_status = false
- btn_disable_status = true
- else
- btn_start_status = false
- btn_action_status = false
- btn_stop_status = false
- btn_enable_status = true
- btn_disable_status = false
- end
- if serviceRunning then
- btn_start_status = false
- btn_action_status = true
- btn_stop_status = true
- else
- btn_action_status = false
- btn_stop_status = false
- end
--%>
-
-<%+cbi/valueheader%>
- <input type="button" class="btn cbi-button cbi-button-apply" id="btn_start" name="start" value="<%:Start%>"
- onclick="button_action(this)" />
- <span id="btn_start_spinner" class="btn_spinner"></span>
- <input type="button" class="btn cbi-button cbi-button-apply" id="btn_action" name="action" value="<%:Reload%>"
- onclick="button_action(this)" />
- <span id="btn_action_spinner" class="btn_spinner"></span>
- <input type="button" class="btn cbi-button cbi-button-reset" id="btn_stop" name="stop" value="<%:Stop%>"
- onclick="button_action(this)" />
- <span id="btn_stop_spinner" class="btn_spinner"></span>
- &#160;
- &#160;
- &#160;
- &#160;
- <input type="button" class="btn cbi-button cbi-button-apply" id="btn_enable" name="enable" value="<%:Enable%>"
- onclick="button_action(this)" />
- <span id="btn_enable_spinner" class="btn_spinner"></span>
- <input type="button" class="btn cbi-button cbi-button-reset" id="btn_disable" name="disable" value="<%:Disable%>"
- onclick="button_action(this)" />
- <span id="btn_disable_spinner" class="btn_spinner"></span>
-<%+cbi/valuefooter%>
-
-<%-if not btn_start_status then%>
-<script type="text/javascript">document.getElementById("btn_start").disabled = true;</script>
-<%-end%>
-<%-if not btn_action_status then%>
-<script type="text/javascript">document.getElementById("btn_action").disabled = true;</script>
-<%-end%>
-<%-if not btn_stop_status then%>
-<script type="text/javascript">document.getElementById("btn_stop").disabled = true;</script>
-<%-end%>
-<%-if not btn_enable_status then%>
-<script type="text/javascript">document.getElementById("btn_enable").disabled = true;</script>
-<%-end%>
-<%-if not btn_disable_status then%>
-<script type="text/javascript">document.getElementById("btn_disable").disabled = true;</script>
-<%-end%>
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
deleted file mode 100644
index 6fb3d51d3b..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/css.htm
+++ /dev/null
@@ -1,9 +0,0 @@
-<style type="text/css">
- .btn_spinner
- {
- display: inline-block;
- width: 0px;
- height: 16px;
- margin: 0 0px;
- }
-</style>
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
deleted file mode 100644
index fac92a3925..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm
+++ /dev/null
@@ -1,60 +0,0 @@
-
-<script type="text/javascript">
-//<![CDATA[
- function button_action(action) {
- var xhr = new XHR(false);
- var btn_start = document.getElementById("btn_start");
- var btn_action = document.getElementById("btn_action");
- var btn_stop = document.getElementById("btn_stop");
- var btn_enable = document.getElementById("btn_enable");
- var btn_disable = document.getElementById("btn_disable");
- var btn_spinner;
- switch (action.name) {
- case "start":
- btn_spinner = document.getElementById("btn_start_spinner");
- break;
- case "action":
- btn_spinner = document.getElementById("btn_action_spinner");
- break;
- case "stop":
- btn_spinner = document.getElementById("btn_stop_spinner");
- break;
- case "enable":
- btn_spinner = document.getElementById("btn_enable_spinner");
- break;
- case "disable":
- btn_spinner = document.getElementById("btn_disable_spinner");
- break;
- }
- btn_start.disabled = true;
- btn_action.disabled = true;
- btn_stop.disabled = true;
- 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,
- function (x) {
- if (!x) {
- return;
- }
- btn_start.disabled = false;
- btn_action.disabled = false;
- btn_stop.disabled = false;
- btn_enable.disabled = false;
- btn_disable.disabled = false;
- spinner(btn_spinner, 0);
- location.reload();
- });
-}
-function spinner(element, state) {
- if (state === 1) {
- element.style.width = "16px";
- element.innerHTML = '<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" width="16" height="16" style="vertical-align:middle" />';
- }
- else {
- element.style.width = "0px";
- element.innerHTML = '';
- }
-}
-//]]>
-</script>
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
deleted file mode 100644
index 3840cd19d4..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/status-textarea.htm
+++ /dev/null
@@ -1,13 +0,0 @@
-<%#
-Copyright 2017-2019 Stan Grishin (stangri@melmac.net)
-This is free software, licensed under the Apache License, Version 2.0
--%>
-
-<%+cbi/valueheader%>
-
-<textarea rows="<%=select(2, self:cfgvalue(section):gsub('\n', ''))%>"
- style="border:none;box-shadow:none;background:transparent;font-weight:bold;line-height:20px;width:50em;padding:none;margin:6px;resize:none;overflow:hidden;"
- disabled="disabled"><%=self:cfgvalue(section)%>
-</textarea>
-
-<%+cbi/valuefooter%>
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
deleted file mode 100644
index b02c7faa82..0000000000
--- a/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/status.htm
+++ /dev/null
@@ -1,12 +0,0 @@
-<%#
-Copyright 2017-2018 Dirk Brenken (dev@brenken.org)
-This is free software, licensed under the Apache License, Version 2.0
--%>
-
-<%+cbi/valueheader%>
-
-<div style="font-weight:bold;">
- <%=self:cfgvalue(section):gsub('\n', '<br />' )%>
-</div>
-
-<%+cbi/valuefooter%>