Debian compatibility

This commit is contained in:
Adam Outler
2026-02-01 01:42:20 +00:00
parent 900e418be9
commit d6457a53a0
2 changed files with 10 additions and 2 deletions

View File

@@ -135,6 +135,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
procps \
gosu \
jq \
ipcalc \
&& wget -qO /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg \
&& echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list \
&& apt-get update \

View File

@@ -13,7 +13,14 @@ get_scan_subnets() {
while read -r _cidr _iface; do
[[ "$_iface" =~ ^(lo|docker|veth) ]] && continue
_net=$(ipcalc -n "$_cidr" | awk -F= '{print $2}')
# Robustly get network address regardless of ipcalc version
if ipcalc -n "$_cidr" | grep -q '^Network:'; then
# Debian-style
_net=$(ipcalc -n "$_cidr" | grep '^Network:' | awk '{print $2}' | cut -d/ -f1)
else
# Alpine-style (Busybox)
_net=$(ipcalc -n "$_cidr" | awk -F= '{print $2}' | awk '{print $1}')
fi
_mask=$(echo "$_cidr" | cut -d/ -f2)
_entry="${_net}/${_mask} --interface=${_iface}"
@@ -66,7 +73,7 @@ if [ ! -f "${NETALERTX_CONFIG}/app.conf" ]; then
exit 2
}
# Generate the dynamic subnet list
SCAN_LIST=$(get_scan_subnets)
SCAN_LIST=$(get_scan_subnets | tr -d '\n\r')
# Inject into the newly deployed config
sed -i "s|^SCAN_SUBNETS=.*|SCAN_SUBNETS=$SCAN_LIST|" "${NETALERTX_CONFIG}/app.conf" ||true