summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-app-https-dns-proxy/luasrc
diff options
context:
space:
mode:
authorStan Grishin <stangri@melmac.net>2020-04-24 10:05:45 +0000
committerStan Grishin <stangri@melmac.net>2020-04-24 10:10:37 +0000
commitd16e7e463165235e1752fb3579d3f0ae1d69e2dd (patch)
tree5c6d682504badcc7f2065712ebace213bae33a25 /applications/luci-app-https-dns-proxy/luasrc
parentc2d8275fdae8caf76cb54af553bcf880d2c6f157 (diff)
luci-app-https-dns-proxy: add CIRA Canadian Shiled
Signed-off-by: Stan Grishin <stangri@melmac.net>
Diffstat (limited to 'applications/luci-app-https-dns-proxy/luasrc')
-rw-r--r--applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua2
-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/model/cbi/https-dns-proxy.lua2
5 files changed, 26 insertions, 2 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
index 9ab541849..10ce13e0c 100644
--- a/applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua
+++ b/applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua
@@ -1,7 +1,7 @@
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")).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
end
end
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
new file mode 100644
index 000000000..978a04e9b
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/ca.cira.canadianshield.family.lua
@@ -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"
+}
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
new file mode 100644
index 000000000..438bcf25f
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/ca.cira.canadianshield.private.lua
@@ -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"
+}
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
new file mode 100644
index 000000000..e0bd3be10
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/ca.cira.canadianshield.protected.lua
@@ -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"
+}
diff --git a/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua b/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua
index 14e1b5434..4b3314e91 100644
--- a/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua
+++ b/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua
@@ -89,7 +89,7 @@ else
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.template = "cbi/nullsection"