From 97c00113bebd95bce5261bd22415a7a910cbe90c Mon Sep 17 00:00:00 2001
From: "CanbiZ (MickLesk)" <47820557+MickLesk@users.noreply.github.com>
Date: Mon, 31 Aug 2026 08:49:57 +0200
Subject: [PATCH] ntopng: use ntop.org's documented apt repo per Debian
 codename, not always apt-stable (#16862)

---
 ct/ntopng.sh              |  4 +++-
 install/ntopng-install.sh | 10 +++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ct/ntopng.sh b/ct/ntopng.sh
index cff63efab..fda4c058a 100644
--- a/ct/ntopng.sh
+++ b/ct/ntopng.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/build.func)
+_CS_DEFAULT_URL="https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main"
+_cs_boot="${COMMUNITY_SCRIPTS_CORE_DIR:-$(dirname "${BASH_SOURCE[0]}")/../../core}/core/build.func"
+source "$_cs_boot" 2>/dev/null || source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/build.func")
 # Copyright (c) 2021-2026 community-scripts ORG
 # Author: MickLesk (CanbiZ)
 # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
diff --git a/install/ntopng-install.sh b/install/ntopng-install.sh
index 6538e004e..a5abf8f70 100644
--- a/install/ntopng-install.sh
+++ b/install/ntopng-install.sh
@@ -13,7 +13,15 @@ setting_up_container
 network_check
 update_os
 
-fetch_and_deploy_from_url "https://packages.ntop.org/apt-stable/$(get_os_info codename)/all/apt-ntop-stable.deb" ""
+NTOP_CODENAME="$(get_os_info codename)"
+case "$NTOP_CODENAME" in
+bookworm | trixie)
+  fetch_and_deploy_from_url "https://packages.ntop.org/apt/${NTOP_CODENAME}/all/apt-ntop.deb" ""
+  ;;
+*)
+  fetch_and_deploy_from_url "https://packages.ntop.org/apt-stable/${NTOP_CODENAME}/all/apt-ntop-stable.deb" ""
+  ;;
+esac
 
 msg_info "Installing ntopng"
 $STD apt update