From fe8c410bf27879dcd35e704ba6cf549fc71acfa4 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Wed, 30 Jan 2019 00:21:41 -0600
Subject: [PATCH] move settings file

---
 nodemgmt-scripts.sh | 8 ++++++--
 run.sh              | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index 6b985040..9af289c9 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -3,9 +3,13 @@
 
 action="$1"
 
+if [ ! -f /opt/idssys/settings/nodemgmt.conf ]; then
+	mv /opt/idssys/nodemgmt/settings.conf /opt/idssys/settings/nodemgmt.conf
+fi
+
 source /opt/idssys/defaults/colors.inc
 source /opt/idssys/defaults/default.inc
-source /opt/idssys/nodemgmt/settings.conf
+source /opt/idssys/settings/nodemgmt.conf
 source /opt/idssys/nodemgmt/defaults.inc
 
 
@@ -157,7 +161,7 @@ case "$1" in
 					for srvc in "${NODE_SERVICES[@]}"
 					do
 						if [ $(${NCMD} pgrep ${srvc} | wc -l) -lt "1" ]; then
-						echo "${NM_SERVICES[${srvc}]} is down" | mail -s "iDS-Node${nid}-${nip}" ${STATUS_CHECK_EMAIL}
+						echo "${NM_SERVICES[${srvc}]} is down" | mail -s "${NODE_HOSTNAME}-${nip}" ${STATUS_CHECK_EMAIL}
 					fi
 					done
 					nid=`expr $nid + 1`
diff --git a/run.sh b/run.sh
index 9a306b76..d5190817 100755
--- a/run.sh
+++ b/run.sh
@@ -4,6 +4,7 @@
 source /opt/idssys/defaults/colors.inc
 source /opt/idssys/defaults/default.inc
 source /opt/idssys/nodemgmt/settings.conf
+source /opt/idssys/settings/nodemgmt.conf
 source /opt/idssys/nodemgmt/defaults.inc
 
 declare -A SERVICES