From 179233810ed00e9939f1592c94c001321fd741b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Slavi=C5=A1a=20Are=C5=BEina?= <58952836+tremor021@users.noreply.github.com> Date: Thu, 11 Dec 2025 10:53:49 +0100 Subject: [PATCH] Refactor (#9863) --- ct/technitiumdns.sh | 10 +++++++++- frontend/public/json/technitiumdns.json | 2 +- install/technitiumdns-install.sh | 14 ++++++++------ 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/ct/technitiumdns.sh b/ct/technitiumdns.sh index df67e1124..93a09b1f2 100644 --- a/ct/technitiumdns.sh +++ b/ct/technitiumdns.sh @@ -11,7 +11,7 @@ var_cpu="${var_cpu:-1}" var_ram="${var_ram:-512}" var_disk="${var_disk:-2}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" @@ -30,6 +30,14 @@ function update_script() { if is_package_installed "aspnetcore-runtime-8.0"; then $STD apt remove -y aspnetcore-runtime-8.0 + [ -f /etc/apt/sources.list.d/microsoft-prod.list ] && rm -f /etc/apt/sources.list.d/microsoft-prod.list + [ -f /usr/share/keyrings/microsoft-prod.gpg ] && rm -f /usr/share/keyrings/microsoft-prod.gpg + setup_deb822_repo \ + "microsoft" \ + "https://packages.microsoft.com/keys/microsoft-2025.asc" \ + "https://packages.microsoft.com/debian/13/prod/" \ + "trixie" \ + "main" $STD apt install -y aspnetcore-runtime-9.0 fi diff --git a/frontend/public/json/technitiumdns.json b/frontend/public/json/technitiumdns.json index 8e4e8b17f..59395467e 100644 --- a/frontend/public/json/technitiumdns.json +++ b/frontend/public/json/technitiumdns.json @@ -23,7 +23,7 @@ "ram": 512, "hdd": 2, "os": "debian", - "version": "12" + "version": "13" } } ], diff --git a/install/technitiumdns-install.sh b/install/technitiumdns-install.sh index 2d4a5853d..eb246bea4 100644 --- a/install/technitiumdns-install.sh +++ b/install/technitiumdns-install.sh @@ -13,13 +13,15 @@ setting_up_container network_check update_os -msg_info "Installing ASP.NET Core Runtime" -curl -fsSL "https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb" -o "packages-microsoft-prod.deb" -$STD dpkg -i packages-microsoft-prod.deb -rm -rf packages-microsoft-prod.deb -$STD apt update +msg_info "Installing Dependencies" +setup_deb822_repo \ + "microsoft" \ + "https://packages.microsoft.com/keys/microsoft-2025.asc" \ + "https://packages.microsoft.com/debian/13/prod/" \ + "trixie" \ + "main" $STD apt install -y aspnetcore-runtime-9.0 -msg_ok "Installed ASP.NET Core Runtime" +msg_ok "Installed Dependencies" RELEASE=$(curl -fsSL https://technitium.com/dns/ | grep -oP 'Version \K[\d.]+') msg_info "Installing Technitium DNS"