From 7208496990d09bc9ab82855779f2369514567b37 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 1 Jun 2025 20:09:31 -0500 Subject: [PATCH] Update defaults.inc --- defaults.inc | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/defaults.inc b/defaults.inc index f319bb9..31c5123 100755 --- a/defaults.inc +++ b/defaults.inc @@ -10,18 +10,16 @@ noheader=" gettsip-node get-crontabs get-crontab update report updatenodes runcm [ "$(ip route | awk '/default/ { print $5 }')" == "link" ] && RNIP=$(ip addr show $(ip route | awk '/1 dev eth0/ { print $5; exit }') | 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) -mysqlcmd="mariadb --skip-ssl" -if [ "${TAILSCALE}" == "true" ]; then +mysqlcmd="mariadb --skip-ssl" +if [[ "${RNIP}" == "10.6.1"* ]]; then + mysqlcmd="mysql" + mysql_conn="-h ${NM_SINGLESRVR_IP['MYSQL']}" +elif [ "${TAILSCALE}" == "true" ]; then nmip=${NM_NODEMANAGER_TS} mysql_conn="-h 100.100.5.6 -P 3307" elif [ "${NM_NODEMANAGER}" != "" ]; then nmip=${NM_NODEMANAGER} - if [[ "${RNIP}" == "10.6.1"* ]]; then - mysqlcmd="mysql" - mysql_conn="-h ${NM_SINGLESRVR_IP['MYSQL']}" - else - mysql_conn="-h ${NM_SINGLESRVR_IP['MYSQL']} -P 3307" - fi + mysql_conn="-h ${NM_SINGLESRVR_IP['MYSQL']} -P 3307" else nmip=10.10.10.60 mysql_conn=10.10.1.50