Unverified Commit 51bffea2 authored by Kroese's avatar Kroese Committed by GitHub
Browse files

feat: Improve IPv6 check (#1111)

parent eb69d4a2

src/network.sh

+1 −1
Original line number Diff line number Diff line
@@ -740,7 +740,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)

src/server.sh

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,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