diff --git a/defaults.inc b/defaults.inc index 32c1ea22..a356edc2 100755 --- a/defaults.inc +++ b/defaults.inc @@ -114,18 +114,18 @@ NM_LOGFILE=${NM_LOGFOLDER}/logfile NM_WANDNS='wdns.scity.us' NM_LANDNS='ldns.scity.us' -# TSI=$(ip link | grep tailscale0) -# if [ ${#TSI} != 0 ]; then -# RUN_NODE_TSIP=$(ip -o -4 addr list tailscale0 | awk '{print $4}' | cut -d/ -f1) -# else -# RUN_NODE_TSIP=[ "$(ip route | awk '/default/ { print $5 }')" == "link" ] -# RNIP=$(ip addr show $(ip route | awk '/1 dev eth0/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) || -# RNIP=$(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) - -TSI=$(/sbin/ip link | grep tailscale0) && [ ${#TSI} != 0 ] && RUN_NODE_TSIP=$(/sbin/ip -o -4 addr list tailscale0 | awk '{print $4}' | cut -d/ -f1) || RUN_NODE_TSIP= -[ "$(ip route | awk '/default/ { print $5 }')" == "link" ] && RNIP=$(ip addr show $(ip route | awk '/1 dev eth0/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) || - RNIP=$(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) - +TSI=$(ip link | grep tailscale0) +if [ ${#TSI} != 0 ]; then + RUN_NODE_TSIP=$(ip -o -4 addr list tailscale0 | awk '{print $4}' | cut -d/ -f1) +else + RUN_NODE_TSIP="" + if [ "$(ip route | awk '/default/ { print $5 }')" == "link" ]; then + RNIP=$(ip addr show $(ip route | awk '/1 dev eth0/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) + else + RNIP=$(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) + fi +fi + if [ "${RNIP}" == "${NM_NODEMANAGER}" ]; then RUN_NODE_TYPE=NM; RUN_NODE_IP=${RNIP}