Merge pull request #7224 from Hekkfern/update-mullvad-provider

luci-app-https-dns-proxy: Mullvad URL update

4 files changed, 96 insertions, 27 deletions

diff --git a/applications/luci-app-https-dns-proxy/Makefile b/applications/luci-app-https-dns-proxy/Makefile
index 9ca8811899..8bc5263ad3 100644
--- a/applications/luci-app-https-dns-proxy/Makefile
+++ b/applications/luci-app-https-dns-proxy/Makefile
@@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=luci-app-https-dns-proxy
 PKG_LICENSE:=AGPL-3.0-or-later
 PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
-PKG_VERSION:=2023.11.19
-PKG_RELEASE:=4
+PKG_VERSION:=2023.12.26
+PKG_RELEASE:=1
 
 LUCI_TITLE:=DNS Over HTTPS Proxy Web UI
 LUCI_URL:=https://github.com/stangri/luci-app-https-dns-proxy/
diff --git a/applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/net.mullvad.dns.json b/applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/net.mullvad.dns.json
new file mode 100644
index 0000000000..318497ff62
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/net.mullvad.dns.json
@@ -0,0 +1,41 @@
+{
+	"title": "Mullvad",
+	"template": "https://{option}dns.mullvad.net/dns-query",
+	"bootstrap_dns": "1.1.1.1,1.0.0.1,2606:4700:4700::1111,2606:4700:4700::1001,8.8.8.8,8.8.4.4,2001:4860:4860::8888,2001:4860:4860::8844",
+	"help_link": "https://mullvad.net/en/help/dns-over-https-and-dns-over-tls/",
+	"http2_only": true,
+	"params": {
+		"option": {
+			"description": "Variant",
+			"type": "select",
+			"regex": "(|adblock.|base.|extended.|family.|all.)",
+			"options": [
+				{
+					"value": "",
+					"description": "Standard"
+				},
+				{
+					"value": "adblock.",
+					"description": "Ads and Trackers Filter"
+				},
+				{
+					"value": "base.",
+					"description": "Ads, Trackers, and Malware Filter"
+				},
+				{
+					"value": "extended.",
+					"description": "Ads, Trackers, Malware, and Social Media Filter"
+				},
+				{
+					"value": "family.",
+					"description": "Ads, Trackers, Malware, Adult, and Gambling"
+				},
+				{
+					"value": "all.",
+					"description": "Ads, Trackers, Malware, Adult, Gambling, and Social Media Filter"
+				}
+			],
+			"default": ""
+		}
+	}
+}
diff --git a/applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/net.mullvad.doh.json b/applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/net.mullvad.doh.json
deleted file mode 100644
index 18dad9c214..0000000000
--- a/applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/net.mullvad.doh.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"title": "Mullvad",
-	"template": "https://{option}doh.mullvad.net/dns-query",
-	"bootstrap_dns": "1.1.1.1,1.0.0.1,2606:4700:4700::1111,2606:4700:4700::1001,8.8.8.8,8.8.4.4,2001:4860:4860::8888,2001:4860:4860::8844",
-	"help_link": "https://mullvad.net/en/help/dns-over-https-and-dns-over-tls/",
-	"http2_only": true,
-	"params": {
-		"option": {
-			"description": "Variant",
-			"type": "select",
-			"regex": "(adblock.|)",
-			"options": [
-				{
-					"value": "adblock.",
-					"description": "AdBlocking Filter"
-				},
-				{
-					"value": "",
-					"description": "Standard"
-				}
-			],
-			"default": ""
-		}
-	}
-}
diff --git a/applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/net.mullvad.json b/applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/net.mullvad.json
new file mode 100644
index 0000000000..c4a405350f
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/net.mullvad.json
@@ -0,0 +1,53 @@
+{
+	"title": "Mullvad Regional",
+	"template": "https://{option}.mullvad.net/dns-query",
+	"bootstrap_dns": "1.1.1.1,1.0.0.1,2606:4700:4700::1111,2606:4700:4700::1001,8.8.8.8,8.8.4.4,2001:4860:4860::8888,2001:4860:4860::8844",
+	"help_link": "https://mullvad.net/en/help/dns-over-https-and-dns-over-tls/",
+	"http2_only": true,
+	"params": {
+		"option": {
+			"description": "Region",
+			"type": "select",
+			"regex": "(de-fra-dns-001|gb-lon-dns-001|gb-lon-dns-301|se-got-dns-001|se-mma-dns-001|se-sto-dns-001|sg-sin-dns-101|us-dal-dns-001|us-nyc-dns-601)",
+			"options": [
+				{
+					"value": "de-fra-dns-001",
+					"description": "Frankfurt, Germany"
+				},
+				{
+					"value": "gb-lon-dns-001",
+					"description": "London, United Kingdom (1)"
+				},
+				{
+					"value": "gb-lon-dns-301",
+					"description": "London, United Kingdom (2)"
+				},
+				{
+					"value": "se-got-dns-001",
+					"description": "Gothenburg, Sweden"
+				},
+				{
+					"value": "se-mma-dns-001",
+					"description": "Malmö, Sweden"
+				},
+				{
+					"value": "se-sto-dns-001",
+					"description": "Stockholm, Sweden"
+				},
+				{
+					"value": "sg-sin-dns-101",
+					"description": "Singapore"
+				},
+				{
+					"value": "us-dal-dns-001",
+					"description": "Dallas, United States"
+				},
+				{
+					"value": "us-nyc-dns-601",
+					"description": "New York City, United States"
+				}
+			],
+			"default": "us-nyc-dns-601"
+		}
+	}
+}