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

Merge pull request #3960 from stangri/19.07-luci-app-https-dns-proxy

Browse source 
[19.07] luci-app-https-dns-proxy: add CIRA Canadian Shiled
This commit is contained in:
Hannu Nyman 2020-04-24 17:32:11 +03:00 committed by GitHub
commit 39a82906a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 55 additions and 19 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")) entry({"admin", "services", "https-dns-proxy"}, cbi("https-dns-proxy"), _("DNS HTTPS 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"

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

@ -1,7 +1,7 @@
msgid "" msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8" msgstr "Content-Type: text/plain; charset=UTF-8"
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:59 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:58
msgid "%s is not installed or not found" msgid "%s is not installed or not found"
msgstr "" msgstr ""
@ -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:93 #: 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
@ -49,7 +61,7 @@ msgstr ""
msgid "Disable" msgid "Disable"
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:164 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:163
msgid "EDNS client subnet" msgid "EDNS client subnet"
msgstr "" msgstr ""
@ -65,7 +77,7 @@ msgstr ""
msgid "Google" msgid "Google"
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:113 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:112
msgid "Instances" msgid "Instances"
msgstr "" msgstr ""
@ -77,11 +89,11 @@ msgstr ""
msgid "LibreDNS (No Ads)" msgid "LibreDNS (No Ads)"
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:147 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
msgid "Listen address" msgid "Listen address"
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:160 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:159
msgid "Listen port" msgid "Listen port"
msgstr "" msgstr ""
@ -93,7 +105,7 @@ msgstr ""
msgid "ODVR (nic.cz)" msgid "ODVR (nic.cz)"
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:167 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:166
msgid "Proxy server" msgid "Proxy server"
msgstr "" msgstr ""
@ -117,19 +129,19 @@ msgstr ""
msgid "Reload" msgid "Reload"
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:120 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:119
msgid "Resolver" msgid "Resolver"
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:84
msgid "Running: %s DoH at %s:%s" msgid "Running: %s DoH at %s:%s"
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:97 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:96
msgid "Service Status" msgid "Service Status"
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:95 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:94
msgid "Service Status [%s %s]" msgid "Service Status [%s %s]"
msgstr "" msgstr ""
@ -141,7 +153,7 @@ msgstr ""
msgid "Stop" msgid "Stop"
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:63 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:62
msgid "Stopped" msgid "Stopped"
msgstr "" msgstr ""
@ -149,7 +161,7 @@ msgstr ""
msgid "Unknown Provider" msgid "Unknown Provider"
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:114 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:113
msgid "" msgid ""
"When you add/remove any instances below, they will be used to override the " "When you add/remove any instances below, they will be used to override the "
"'DNS forwardings' section of <a href=\"%s\">DHCP and DNS</a>." "'DNS forwardings' section of <a href=\"%s\">DHCP and DNS</a>."
@ -159,7 +171,7 @@ msgstr ""
msgid "and" msgid "and"
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:65 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
msgid "disabled" msgid "disabled"
msgstr "" msgstr ""