From df33736c371c1e0e46581dd7f3c2772ada7d1e30 Mon Sep 17 00:00:00 2001
From: Daniel Pawlik <pawlik.dan@gmail.com>
Date: Mon, 21 Oct 2024 10:39:20 +0200
Subject: [PATCH] Change dnscrypt-proxy2 to unbound; add fping

---
 configs/common/dumb_ap         | 13 +------------
 configs/common/main-router     |  6 +++++-
 configs/common/parents         |  7 +++++--
 configs/common/parents-minimal | 11 +++--------
 openwrt-configure.sh           |  6 +++++-
 5 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/configs/common/dumb_ap b/configs/common/dumb_ap
index c67cd74..3f38eee 100644
--- a/configs/common/dumb_ap
+++ b/configs/common/dumb_ap
@@ -30,6 +30,7 @@ CONFIG_PACKAGE_ethtool-full=y
 CONFIG_PACKAGE_pciutils=y
 CONFIG_PACKAGE_irqbalance=y
 CONFIG_PACKAGE_luci-app-irqbalance=y
+CONFIG_PACKAGE_fping=y
 
 # attendedsysupgrade / owut
 CONFIG_PACKAGE_owut=y
@@ -37,18 +38,6 @@ CONFIG_PACKAGE_owut=y
 # use experimental kernel
 CONFIG_TESTING_KERNEL=y
 
-## wireguard
-#CONFIG_PACKAGE_kmod-wireguard=y
-#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
-
 # collecd
 CONFIG_PACKAGE_luci-app-statistics=y
 CONFIG_PACKAGE_collectd=y
diff --git a/configs/common/main-router b/configs/common/main-router
index 0b12344..0a43967 100644
--- a/configs/common/main-router
+++ b/configs/common/main-router
@@ -32,6 +32,7 @@ CONFIG_PACKAGE_pciutils=y
 # CONFIG_PACKAGE_luci-app-irqbalance=y
 CONFIG_PACKAGE_tc-full=y
 # CONFIG_PACKAGE_tc-tiny is not set
+CONFIG_PACKAGE_fping=y
 
 # attendedsysupgrade / owut
 CONFIG_PACKAGE_owut=y
@@ -51,7 +52,10 @@ CONFIG_PACKAGE_qrencode=y
 # CONFIG_PACKAGE_libnghttp3 is not set
 # CONFIG_PACKAGE_libngtcp2 is not set
 
-CONFIG_PACKAGE_dnscrypt-proxy2=y
+# CONFIG_PACKAGE_dnscrypt-proxy2=y
+
+CONFIG_PACKAGE_unbound-daemon=y
+CONFIG_PACKAGE_luci-app-unbound=y
 
 # collecd
 CONFIG_PACKAGE_luci-app-statistics=y
diff --git a/configs/common/parents b/configs/common/parents
index d52b835..db6b517 100644
--- a/configs/common/parents
+++ b/configs/common/parents
@@ -30,9 +30,10 @@ CONFIG_PACKAGE_curl=y
 # CONFIG_PACKAGE_pciutils is not set
 CONFIG_PACKAGE_irqbalance=y
 CONFIG_PACKAGE_luci-app-irqbalance=y
+CONFIG_PACKAGE_fping=y
 
 # attendedsysupgrade / owut
-# CONFIG_PACKAGE_owut is not set
+CONFIG_PACKAGE_owut=y
 # CONFIG_PACKAGE_auc is not set
 
 # use experimental kernel
@@ -46,7 +47,9 @@ CONFIG_PACKAGE_luci-proto-wireguard=y
 
 ## https dns
 # CONFIG_PACKAGE_dnscrypt-proxy2 is not set
-CONFIG_PACKAGE_https-dns-proxy=y
+# CONFIG_PACKAGE_https-dns-proxy is not set
+CONFIG_PACKAGE_unbound-daemon=y
+CONFIG_PACKAGE_luci-app-unbound=y
 
 # collecd
 CONFIG_PACKAGE_luci-app-statistics=y
diff --git a/configs/common/parents-minimal b/configs/common/parents-minimal
index ed581f4..e657992 100644
--- a/configs/common/parents-minimal
+++ b/configs/common/parents-minimal
@@ -30,6 +30,7 @@ CONFIG_PACKAGE_curl=y
 # CONFIG_PACKAGE_pciutils is not set
 # CONFIG_PACKAGE_irqbalance is not set
 # CONFIG_PACKAGE_luci-app-irqbalance is not set
+CONFIG_PACKAGE_fping=y
 
 # attendedsysupgrade / owut
 CONFIG_PACKAGE_owut=y
@@ -38,15 +39,9 @@ CONFIG_PACKAGE_owut=y
 # use experimental kernel
 # CONFIG_TESTING_KERNEL is not set
 
-## wireguard
-# CONFIG_PACKAGE_kmod-wireguard is not set
-# CONFIG_PACKAGE_wireguard-tools is not set
-# CONFIG_PACKAGE_luci-proto-wireguard is not set
-# CONFIG_PACKAGE_qrencode is not set
-
 ## https dns
-# CONFIG_PACKAGE_dnscrypt-proxy2 is not set
-CONFIG_PACKAGE_https-dns-proxy=y
+CONFIG_PACKAGE_unbound-daemon=y
+CONFIG_PACKAGE_luci-app-unbound=y
 
 # collecd
 CONFIG_PACKAGE_luci-app-statistics=y
diff --git a/openwrt-configure.sh b/openwrt-configure.sh
index 251ce17..1a77d6c 100755
--- a/openwrt-configure.sh
+++ b/openwrt-configure.sh
@@ -12,7 +12,8 @@ INSTALL_BRIDGER=${INSTALL_BRIDGER:-'false'}
 INSTALL_DAWN=${INSTALL_DAWN:-'true'}
 INSTALL_USTEER=${INSTALL_USTEER:-'false'}
 INSTALL_HTTPS_DNS_PROXY=${INSTALL_HTTPS_DNS_PROXY:-'false'}
-INSTALL_DNSCRYPT_PROXY2=${INSTALL_DNSCRYPT_PROXY2:-'true'}
+INSTALL_DNSCRYPT_PROXY2=${INSTALL_DNSCRYPT_PROXY2:-'false'}
+INSTALL_UNBOUND=${INSTALL_UNBOUND:-'true'}
 CRYPTO_LIB=${CRYPTO_LIB:-'openssl'} # wolfssl or openssl; if empty - mbedtls
 ADDITIONAL_DRIVERS=${ADDITIONAL_DRIVERS:-'kmod-mt7921e kmod-mt7921-common kmod-mt7921-firmware kmod-mt7925-common kmod-mt7925e'}
 INSTALL_LANG_PACKAGES=${INSTALL_LANG_PACKAGES:-'true'}
@@ -76,6 +77,9 @@ if [[ "$DEVICE" =~ Main|main ]]; then
     if [[ "$INSTALL_DNSCRYPT_PROXY2" =~ True|true ]]; then
         PACKAGES="$PACKAGES dnscrypt-proxy2"
     fi
+    if [[ "$INSTALL_UNBOUND" =~ True|true ]]; then
+        PACKAGES="$PACKAGES unbound-daemon"
+    fi
 fi
 
 if ! [[ "$DEVICE" =~ Main|main ]] && [[ "$INSTALL_BRIDGER" =~ True|true ]]; then