luci-app-https-dns-proxy: add AhaDNS and minor fixes

* Add AhaDNS: thanks to @Jefe777 (account now deleted) and their PR at
  https://github.com/openwrt/luci/pull/5612
* Update email addresses
* Add missing new line to ControlD files
* Add RPCD reload to uci-defaults file

Signed-off-by: Stan Grishin <stangri@melmac.ca>

diff --git a/applications/luci-app-https-dns-proxy/Makefile b/applications/luci-app-https-dns-proxy/Makefile
index c85bb3264d79ed79663a8f1f1f93832ca26fca8c..e1d81696c41a0e1782791c6d1ba8fd4cbea830a2 100644 (file)
--- a/applications/luci-app-https-dns-proxy/Makefile
+++ b/applications/luci-app-https-dns-proxy/Makefile
@@ -1,11 +1,11 @@
-# Copyright 2017-2018 Stan Grishin (stangri@melmac.net)
+# Copyright 2017-2018 Stan Grishin (stangri@melmac.ca)
 # This is free software, licensed under the GNU General Public License v3.
 
 include $(TOPDIR)/rules.mk
 
 PKG_LICENSE:=GPL-3.0-or-later
-PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net>
-PKG_VERSION:=2021-07-29-1
+PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
+PKG_VERSION:=2021-09-27-2
 
 LUCI_TITLE:=DNS Over HTTPS Proxy Web UI
 LUCI_DESCRIPTION:=Provides Web UI for DNS Over HTTPS Proxy

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
index 7275cbcc912977e4d8682ad381529a82242fc222..e28cb8132375bd774b1ef490f7b0bb309fc9664c 100644 (file)
--- 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
@@ -5,4 +5,4 @@ return {
        bootstrap_dns = "76.76.2.4,2606:1a40::4",
        help_link = "https://kb.controld.com/tutorials",
        help_link_text = "ControlD"
-}
\ No newline at end of file
+}

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
index bea84b4c1521a687c6bb669456a15ede1fc2d8da..4b8ee0272909a26affe9a5cbd8d9dea59e04ce12 100644 (file)
--- 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
@@ -5,4 +5,4 @@ return {
        bootstrap_dns = "76.76.2.3,2606:1a40::3",
        help_link = "https://kb.controld.com/tutorials",
        help_link_text = "ControlD"
-}
\ No newline at end of file
+}

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
index 5849cbd21cc4cfa134e30ccf33e9727b37658faa..947ed59a1c009daac55bc0dcdd68ac7cf8ab7d7f 100644 (file)
--- 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
@@ -5,4 +5,4 @@ return {
        bootstrap_dns = "76.76.2.2,2606:1a40::2",
        help_link = "https://kb.controld.com/tutorials",
        help_link_text = "ControlD"
-}
\ No newline at end of file
+}

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
index c82a042ec9415b010c6211738656de76dccead1a..77f062b1b43569f8fa5908713cde2a4ec048012a 100644 (file)
--- 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
@@ -5,4 +5,4 @@ return {
        bootstrap_dns = "76.76.2.1,2606:1a40::1",
        help_link = "https://kb.controld.com/tutorials",
        help_link_text = "ControlD"
-}
\ No newline at end of file
+}

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
index eb5bbbd87a69b8433ecb8847bea47b70fa52d6d7..d4128df3435e13a75ce70066f0c1fa602962302f 100644 (file)
--- 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
@@ -5,4 +5,4 @@ return {
        bootstrap_dns = "76.76.2.0,2606:1a40::0",
        help_link = "https://kb.controld.com/tutorials",
        help_link_text = "ControlD"
-}
\ No newline at end of file
+}

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
new file mode 100644 (file)
index 0000000..7fdf97f
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.au.doh.lua
@@ -0,0 +1,8 @@
+return {
+       name = "ahadns-doh-au",
+       label = _("AhaDNS.com - Australia (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
new file mode 100644 (file)
index 0000000..0cc45ad
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.chi.doh.lua
@@ -0,0 +1,8 @@
+return {
+       name = "ahadns-doh-chi",
+       label = _("AhaDNS.com - 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
new file mode 100644 (file)
index 0000000..1550e99
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.es.doh.lua
@@ -0,0 +1,8 @@
+return {
+       name = "ahadns-doh-es",
+       label = _("AhaDNS.com - Spain (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
new file mode 100644 (file)
index 0000000..09a58ce
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.in.doh.lua
@@ -0,0 +1,8 @@
+return {
+       name = "ahadns-doh-in",
+       label = _("AhaDNS.com - India (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
new file mode 100644 (file)
index 0000000..d167a15
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.it.doh.lua
@@ -0,0 +1,8 @@
+return {
+       name = "ahadns-doh-it",
+       label = _("AhaDNS.com - Italy (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
new file mode 100644 (file)
index 0000000..1b8ddb6
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.la.doh.lua
@@ -0,0 +1,8 @@
+return {
+       name = "ahadns-doh-la",
+       label = _("AhaDNS.com - 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
new file mode 100644 (file)
index 0000000..01421a8
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.nl.doh.lua
@@ -0,0 +1,8 @@
+return {
+       name = "ahadns-doh-nl",
+       label = _("AhaDNS.com - Netherlands (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
new file mode 100644 (file)
index 0000000..93478e5
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.no.doh.lua
@@ -0,0 +1,8 @@
+return {
+       name = "ahadns-doh-no",
+       label = _("AhaDNS.com - Norway (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
new file mode 100644 (file)
index 0000000..ca688de
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.ny.doh.lua
@@ -0,0 +1,8 @@
+return {
+       name = "ahadns-doh-ny",
+       label = _("AhaDNS.com - 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
new file mode 100644 (file)
index 0000000..9b0539a
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.pl.doh.lua
@@ -0,0 +1,8 @@
+return {
+       name = "ahadns-doh-pl",
+       label = _("AhaDNS.com - Poland (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/view/https-dns-proxy/buttons.htm b/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm
index f10042a460d965b7f2dd14f82368769c721995e7..6a0120609487eb501e9001ab871c8ec72fc8009e 100644 (file)
--- 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
@@ -1,4 +1,4 @@
-<%# Copyright 2020 Stan Grishin <stangri@melmac.net> -%>
+<%# Copyright 2020 Stan Grishin <stangri@melmac.ca> -%>
 
 <%+https-dns-proxy/css%>
 <%+https-dns-proxy/js%>

diff --git a/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot b/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot
index b46a9498ba68b64c2e27018438f1546c71c611a2..ad50530d4c12b169288bcd10867fdd563d807568 100644 (file)
--- a/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot
+++ b/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot
@@ -17,6 +17,46 @@ msgstr ""
 msgid "AdGuard (Standard)"
 msgstr ""
 
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.au.doh.lua:3
+msgid "AhaDNS.com - Australia (Block Malware + Ads)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.in.doh.lua:3
+msgid "AhaDNS.com - India (Block Malware + Ads)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.it.doh.lua:3
+msgid "AhaDNS.com - Italy (Block Malware + Ads)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.nl.doh.lua:3
+msgid "AhaDNS.com - Netherlands (Block Malware + Ads)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.no.doh.lua:3
+msgid "AhaDNS.com - Norway (Block Malware + Ads)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.pl.doh.lua:3
+msgid "AhaDNS.com - Poland (Block Malware + Ads)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.es.doh.lua:3
+msgid "AhaDNS.com - Spain (Block Malware + Ads)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.chi.doh.lua:3
+msgid "AhaDNS.com - US/Chicago (Block Malware + Ads)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.la.doh.lua:3
+msgid "AhaDNS.com - US/Los Angeles (Block Malware + Ads)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.ny.doh.lua:3
+msgid "AhaDNS.com - US/New York (Block Malware + Ads)"
+msgstr ""
+
 #: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.alidns.dns.lua:3
 msgid "AliDNS"
 msgstr ""

diff --git a/applications/luci-app-https-dns-proxy/root/etc/uci-defaults/40_luci-https-dns-proxy b/applications/luci-app-https-dns-proxy/root/etc/uci-defaults/40_luci-https-dns-proxy
index a1ecfcea2434b3295cb686eb4e9dffadb2e1dea8..b42fa5859fb2691e1092d6aad5f3208b2ae4d180 100644 (file)
--- a/applications/luci-app-https-dns-proxy/root/etc/uci-defaults/40_luci-https-dns-proxy
+++ b/applications/luci-app-https-dns-proxy/root/etc/uci-defaults/40_luci-https-dns-proxy
@@ -1,3 +1,4 @@
 #!/bin/sh
 rm -rf /var/luci-modulecache/; rm -f /var/luci-indexcache;
+[ -x /etc/init.d/rpcd ] && /etc/init.d/rpcd reload
 exit 0