From f9538ce53b09d1b404fd1772f20f1543fad74b65 Mon Sep 17 00:00:00 2001 From: Kroese Date: Fri, 19 Jun 2026 13:24:54 +0200 Subject: [PATCH] feat: Improve IPv6 check (#1180) --- src/network.sh | 2 +- src/server.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/network.sh b/src/network.sh index 2f1d293..6ca703d 100644 --- a/src/network.sh +++ b/src/network.sh @@ -684,7 +684,7 @@ getInfo() { IP6="" # shellcheck disable=SC2143 - if [ -f /proc/net/if_inet6 ] && [ -n "$(ifconfig -a | grep inet6)" ]; then + if [ -f /proc/net/if_inet6 ] && [[ "$(cat /proc/sys/net/ipv6/conf/all/disable_ipv6 2>/dev/null)" != "1" ]] && [ -n "$(ifconfig -a | grep inet6)" ]; then { IP6=$(ip -6 addr show dev "$VM_NET_DEV" scope global up); rc=$?; } 2>/dev/null || : (( rc != 0 )) && IP6="" [ -n "$IP6" ] && IP6=$(echo "$IP6" | sed -e's/^.*inet6 \([^ ]*\)\/.*$/\1/;t;d' | head -n 1) diff --git a/src/server.sh b/src/server.sh index 229a89d..61f34da 100644 --- a/src/server.sh +++ b/src/server.sh @@ -24,7 +24,7 @@ if [[ "${WEB:-}" != [Nn]* ]]; then sed -i "s/proxy_pass http:\/\/127.0.0.1:8004\/;/proxy_pass http:\/\/127.0.0.1:$WSD_PORT\/;/g" /etc/nginx/sites-enabled/web.conf # shellcheck disable=SC2143 - if [ -f /proc/net/if_inet6 ] && [ -n "$(ifconfig -a | grep inet6)" ]; then + if [ -f /proc/net/if_inet6 ] && [[ "$(cat /proc/sys/net/ipv6/conf/all/disable_ipv6 2>/dev/null)" != "1" ]] && [ -n "$(ifconfig -a | grep inet6)" ]; then sed -i "s/listen $WEB_PORT default_server;/listen [::]:$WEB_PORT default_server ipv6only=off;/g" /etc/nginx/sites-enabled/web.conf