mirror of
https://github.com/jokob-sk/NetAlertX.git
synced 2026-04-15 22:51:37 -07:00
Debian compatibility
This commit is contained in:
@@ -135,6 +135,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
|||||||
procps \
|
procps \
|
||||||
gosu \
|
gosu \
|
||||||
jq \
|
jq \
|
||||||
|
ipcalc \
|
||||||
&& wget -qO /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg \
|
&& 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 \
|
&& echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list \
|
||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
|
|||||||
@@ -13,7 +13,14 @@ get_scan_subnets() {
|
|||||||
while read -r _cidr _iface; do
|
while read -r _cidr _iface; do
|
||||||
[[ "$_iface" =~ ^(lo|docker|veth) ]] && continue
|
[[ "$_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)
|
_mask=$(echo "$_cidr" | cut -d/ -f2)
|
||||||
_entry="${_net}/${_mask} --interface=${_iface}"
|
_entry="${_net}/${_mask} --interface=${_iface}"
|
||||||
|
|
||||||
@@ -66,7 +73,7 @@ if [ ! -f "${NETALERTX_CONFIG}/app.conf" ]; then
|
|||||||
exit 2
|
exit 2
|
||||||
}
|
}
|
||||||
# Generate the dynamic subnet list
|
# 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
|
# Inject into the newly deployed config
|
||||||
sed -i "s|^SCAN_SUBNETS=.*|SCAN_SUBNETS=$SCAN_LIST|" "${NETALERTX_CONFIG}/app.conf" ||true
|
sed -i "s|^SCAN_SUBNETS=.*|SCAN_SUBNETS=$SCAN_LIST|" "${NETALERTX_CONFIG}/app.conf" ||true
|
||||||
|
|||||||
Reference in New Issue
Block a user