voltron/NodeMgmt
1
1
Fork 0
Code Issues Pull Requests Releases 1 Activity

Update defaults.inc

Browse Source
This commit is contained in:
David Schroeder
2023-11-16 07:49:56 -06:00
parent 3e142a03d3
commit 6010d1dbf6
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
defaults.inc
View File

@@ -114,7 +114,15 @@ NM_LOGFILE=${NM_LOGFOLDER}/logfile
NM_WANDNS='wdns.scity.us'
NM_LANDNS='ldns.scity.us'
TSI=$(ip link | grep tailscale0) && [ ${#TSI} != 0 ] && RUN_NODE_TSIP=$(ip -o -4 addr list tailscale0 | awk '{print $4}' | cut -d/ -f1) || RUN_NODE_TSIP=
# 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)
@@ -126,7 +134,7 @@ else
var=${NTYPE}_HOSTS[@]
RUN_NODE_TYPE=""
for nip in "${!var}"; do
# echo "${NTYPE} - $nip - ${RUN_NODE_IP} - ${RUN_NODE_TSIP}"
echo "${NTYPE} - $nip - ${RUN_NODE_IP} - ${RUN_NODE_TSIP}"
if [[ "${RUN_NODE_IP}" == *"${nip}"* ]]; then
RUN_NODE_TYPE=${NTYPE};
RUN_NODE_IP=${RUN_NODE_IP}