From fd66c40bdf2794000ed1d93c2789af0e3dc10a56 Mon Sep 17 00:00:00 2001
From: Daniel Pawlik <dpawlik@redhat.com>
Date: Thu, 20 Jun 2024 08:46:44 +0200
Subject: [PATCH] Replace https-dns-proxy with dnscrypt-proxy2

Checking alternative way for DoH and DoL.
---
 configs/common/main-router | 14 +++++++-------
 openwrt-configure.sh       |  9 ++++++++-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/configs/common/main-router b/configs/common/main-router
index 95c3e1b..7ea86b5 100644
--- a/configs/common/main-router
+++ b/configs/common/main-router
@@ -1,5 +1,3 @@
-
-
 # LuCI
 CONFIG_PACKAGE_cgi-io=y
 CONFIG_PACKAGE_libiwinfo-lua=y
@@ -54,11 +52,13 @@ CONFIG_PACKAGE_wireguard-tools=y
 CONFIG_PACKAGE_luci-proto-wireguard=y
 CONFIG_PACKAGE_qrencode=y
 
-# https dns
-CONFIG_PACKAGE_https-dns-proxy=y
-CONFIG_PACKAGE_luci-app-https-dns-proxy=y
-CONFIG_PACKAGE_libnghttp3=y
-CONFIG_PACKAGE_libngtcp2=y
+### https dns - DoH DoL
+# CONFIG_PACKAGE_https-dns-proxy is not set
+# CONFIG_PACKAGE_luci-app-https-dns-proxy is not set
+# CONFIG_PACKAGE_libnghttp3 is not set
+# CONFIG_PACKAGE_libngtcp2 is not set
+
+CONFIG_PACKAGE_dnscrypt-proxy2=y
 
 # collecd
 CONFIG_PACKAGE_luci-app-statistics=y
diff --git a/openwrt-configure.sh b/openwrt-configure.sh
index bc4d33d..aa999af 100755
--- a/openwrt-configure.sh
+++ b/openwrt-configure.sh
@@ -11,6 +11,8 @@ FULL_WPAD="${FULL_WPAD:-'true'}"
 INSTALL_BRIDGER=${INSTALL_BRIDGER:-'true'}
 INSTALL_DAWN=${INSTALL_DAWN:-'false'}
 INSTALL_USTEER=${INSTALL_USTEER:-'true'}
+INSTALL_HTTPS_DNS_PROXY=${INSTALL_HTTPS_DNS_PROXY:-'false'}
+INSTALL_DNSCRYPT_PROXY2=${INSTALL_DNSCRYPT_PROXY2:-'true'}
 CRYPTO_LIB=${CRYPTO_LIB:-''} # wolfssl or openssl
 ADDITIONAL_DRIVERS=${ADDITIONAL_DRIVERS:-'kmod-mt7921e kmod-mt7921-common kmod-mt7921-firmware'}
 
@@ -65,10 +67,15 @@ fi
 # additional packages
 if [[ "$DEVICE" =~ Main|main ]]; then
     PACKAGES="$PACKAGES luci-proto-wireguard kmod-wireguard wireguard-tools qrencode"
-    PACKAGES="$PACKAGES https-dns-proxy luci-app-https-dns-proxy luci-i18n-https-dns-proxy-pl libcurl4 libnghttp3 libngtcp2"
     PACKAGES="$PACKAGES luci-app-vnstat2"
     PACKAGES="$PACKAGES luci-app-sqm"
     PACKAGES="$PACKAGES ddns-scripts luci-app-ddns bind-host"
+    if [[ "$INSTALL_HTTPS_DNS_PROXY" =~ True|true ]]; then
+        PACKAGES="$PACKAGES https-dns-proxy luci-app-https-dns-proxy luci-i18n-https-dns-proxy-pl libcurl4 libnghttp3 libngtcp2"
+    fi
+    if [[ "$INSTALL_DNSCRYPT_PROXY2" =~ True|true ]]; then
+        PACKAGES="$PACKAGES dnscrypt-proxy2"
+    fi
 fi
 
 if ! [[ "$DEVICE" =~ Main|main ]] && [[ "$INSTALL_BRIDGER" =~ True|true ]]; then