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

Signed-off-by: Stan Grishin <stangri@melmac.net>
This commit is contained in:
Stan Grishin 2019-12-19 11:20:13 -07:00
parent 391258f4f6
commit 4fd24073aa
64 changed files with 269 additions and 348 deletions

View file

@ -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

View file

@ -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

View file

@ -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"
}

View file

@ -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"
}

View file

@ -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"
}

View file

@ -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"
}

View file

@ -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"
}

View file

@ -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"
}

View file

@ -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"
}

View file

@ -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
}

View file

@ -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"
}

View file

@ -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"
}

View file

@ -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"
}

View file

@ -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"
}

View file

@ -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"
}

View file

@ -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"
}

View file

@ -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"
}

View file

@ -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

View file

@ -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">

View file

@ -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;

View file

@ -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 ""

View file

@ -0,0 +1,3 @@
#!/bin/sh
rm -rf /var/luci-modulecache/; rm -f /var/luci-indexcache;
exit 0

View file

@ -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"
}

View file

@ -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"
}

View file

@ -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"
}

View file

@ -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"
}

View file

@ -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"
}

View file

@ -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"
}

View file

@ -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"
}

View file

@ -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"
}

View file

@ -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"
}

View file

@ -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 ""

View file

@ -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