From c098d381d5d8c56de22ec459320d5d476dcbb567 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 21 Dec 2024 10:49:55 -0600
Subject: [PATCH] Update defaults.inc

---
 defaults.inc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index ce35299f..e3770fdc 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -8,13 +8,16 @@ HC_CW=60
 PRI_WIDTH=75
 ESXI_DEFAULT_EXHAUST_MIN=85
 
+NM_FOLDER='/opt/idssys/nodemgmt'
+NM_TMPFOLDER=${NM_FOLDER}/.tmp
+[ -f ${NM_FOLDER}/conf/defaults.local.inc ] && source ${NM_FOLDER}/defaults.inc
+
 PW_FOLDER='/opt/idssys/powerwall'
 PW_INCFOLDER=${PW_FOLDER}/inc
 PW_LOGFOLDER=${PW_FOLDER}/logs
 PW_LOGARCHIVE=${PW_FOLDER}/logs/archive
 PW_TMPFOLDER=${PW_FOLDER}/.tmp
-NM_FOLDER='/opt/idssys/nodemgmt'
-NM_TMPFOLDER=${NM_FOLDER}/.tmp
+
 
 [ ! -d ${PW_INCFOLDER} ] && mkdir ${PW_INCFOLDER}
 [ ! -d ${PW_LOGFOLDER} ] && mkdir ${PW_LOGFOLDER}
@@ -30,7 +33,6 @@ PW_LOGPOWER=${PW_LOGFOLDER}/log-power
 M_SRVCOPT=(start stop restart reload enable disable)
 
 source ${PW_FOLDER}/conf/settings.conf
-[ -f ${NM_FOLDER}/conf/defaults.local.inc ] && source ${NM_FOLDER}/defaults.inc
 
 
 IP=$(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1)
@@ -118,6 +120,5 @@ ${NM_HOSTNAMES[${IP}]}" "${SN_TIT}" ${3} ${4} &
 	[ "${PW_EMAIL_NOTICE}" != "" ] && echo -e "${2}\n\n$(date +%Y-%m-%d-%H-%M-%S)\n${NM_HOSTNAMES[${IP}]}" | mail -s "${1}" ${PW_EMAIL_NOTICE}
 	
 }
-echo "HERE: ${IP}: ${NM_HOSTNAMES[${IP}]}"