Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-app-https-dns-proxy: add CIRA Canadian Shiled

Browse source 
Signed-off-by: Stan Grishin <stangri@melmac.net>
This commit is contained in:
Stan Grishin 2020-04-24 10:05:45 +00:00
parent c2d8275fda
commit d16e7e4631
7 changed files with 41 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/luci-app-https-dns-proxy/Makefile
View file

@ -10,7 +10,7 @@ LUCI_TITLE:=DNS Over HTTPS Proxy Web UI
LUCI_DESCRIPTION:=Provides Web UI for DNS Over HTTPS Proxy LUCI_DESCRIPTION:=Provides Web UI for DNS Over HTTPS Proxy
LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +https-dns-proxy LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +https-dns-proxy
LUCI_PKGARCH:=all LUCI_PKGARCH:=all
PKG_RELEASE:=4 PKG_RELEASE:=5
include ../../luci.mk include ../../luci.mk

2
applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua
View file

@ -1,7 +1,7 @@
module("luci.controller.https-dns-proxy", package.seeall) module("luci.controller.https-dns-proxy", package.seeall)
function index() function index()
if nixio.fs.access("/etc/config/https-dns-proxy") then if nixio.fs.access("/etc/config/https-dns-proxy") then
entry({"admin", "services", "https-dns-proxy"}, cbi("https-dns-proxy"), _("DNS Over HTTPS Proxy")).acl_depends = { "luci-app-https-dns-proxy" } 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 entry({"admin", "services", "https-dns-proxy", "action"}, call("https_dns_proxy_action"), nil).leaf = true
end end
end end

8
applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/ca.cira.canadianshield.family.lua Normal file
View file

@ -0,0 +1,8 @@
return {
name = "cira-canadian-shield-family",
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"
}

8
applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/ca.cira.canadianshield.private.lua Normal file
View file

@ -0,0 +1,8 @@
return {
name = "cira-canadian-shield-private",
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"
}

8
applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/ca.cira.canadianshield.protected.lua Normal file
View file

@ -0,0 +1,8 @@
return {
name = "cira-canadian-shield-protected",
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"
}

2
applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua
View file

@ -89,7 +89,7 @@ else
end end
end end
m = Map("https-dns-proxy", translate("DNS Over HTTPS Proxy Settings")) m = Map("https-dns-proxy", translate("DNS HTTPS Proxy Settings"))
h = m:section(TypedSection, "_dummy", translatef("Service Status [%s %s]", packageName, packageVersion)) h = m:section(TypedSection, "_dummy", translatef("Service Status [%s %s]", packageName, packageVersion))
h.template = "cbi/nullsection" h.template = "cbi/nullsection"

16
applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot
View file

@ -13,6 +13,18 @@ msgstr ""
msgid "AdGuard (Standard)" msgid "AdGuard (Standard)"
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/ca.cira.canadianshield.family.lua:3
msgid "CIRA Canadian Shield (Family)"
msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/ca.cira.canadianshield.private.lua:3
msgid "CIRA Canadian Shield (Private)"
msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/ca.cira.canadianshield.protected.lua:3
msgid "CIRA Canadian Shield (Protected)"
msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3 #: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
msgid "CleanBrowsing (Adult Filter)" msgid "CleanBrowsing (Adult Filter)"
msgstr "" msgstr ""
@ -30,11 +42,11 @@ msgid "Cloudflare"
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4 #: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
msgid "DNS Over HTTPS Proxy" msgid "DNS HTTPS Proxy"
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:92 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:92
msgid "DNS Over HTTPS Proxy Settings" msgid "DNS HTTPS Proxy Settings"
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3 #: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3