From b89b9069204301320d41bca4fa0680f965ee1365 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Tue, 27 May 2025 12:37:05 -0500 Subject: [PATCH] Update defaults.inc --- defaults.inc | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/defaults.inc b/defaults.inc index 32a5f5ff..40700ee3 100755 --- a/defaults.inc +++ b/defaults.inc @@ -151,6 +151,32 @@ NM_LOGFILE=${NM_LOGFOLDER}/logfile NM_PDNS_WANDNS='wdns.scity.us' NM_PDNS_LANDNS='ldns.scity.us' +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) +if [ "${RNIP}" == "${NM_NODEMANAGER}" ]; then + RUN_NODE_TYPE=NM; + RUN_NODE_IP=${RNIP} +else + for NTYPE in "${NM_NODE_TYPES[@]}"; do + if [ "${1}" != "service" ] || ([ "${1}" == "service" ] && ([[ "${NM_SERVICES_CHECK[${NTYPE}]}" = *"${2}"* ]] || [ "${NTYPE}" == "${2^^}" ])); then + var=${NTYPE}_HOSTS[@] + RUN_NODE_TYPE="" + for nip in "${!var}"; do + # echo "${NTYPE} - $nip - ${RNIP} - ${RUN_NODE_TSIP}" + if [[ "${RNIP}" == *"${nip}"* ]]; then + RUN_NODE_TYPE=${NTYPE}; + RUN_NODE_IP=${RNIP} + break 2 + elif [[ "${RUN_NODE_TSIP}" == *"${nip}"* ]]; then + RUN_NODE_TYPE=${NTYPE}; + RUN_NODE_IP=${RNIP} + break 2 + fi + done + fi + done +fi [ "${NM_REPL_NGINX_PATHS}" != "" ] && [ "${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}" != "" ] && NM_NGINXPATH=${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]} || NM_NGINXPATH=/etc/nginx if [ "${NM_CERTPATHS}" != "" ]; then