diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 638e6c23..67ebf6b9 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -12,7 +12,7 @@ fi source /opt/idssys/defaults/colors.inc source /opt/idssys/defaults/default.inc -source /opt/idssys/settings/nodemgmt.conf +source /opt/idssys/nodemgmt/settings.conf source /opt/idssys/nodemgmt/defaults.inc #source /opt/idssys/nodemgmt/ssl-check.sh diff --git a/run.sh b/run.sh index 74e1cb09..f3fec187 100755 --- a/run.sh +++ b/run.sh @@ -1,13 +1,13 @@ #!/usr/bin/env bash # NodeMgmt Loader +if [ -f /opt/idssys/settings/nodemgmt.conf ]; then + mv /opt/idssys/settings/nodemgmt.conf /opt/idssys/nodemgmt/settings.conf +fi + source /opt/idssys/defaults/colors.inc source /opt/idssys/defaults/default.inc -if [ ! -f /opt/idssys/settings/nodemgmt.conf ]; then - source /opt/idssys/nodemgmt/settings.conf -else - source /opt/idssys/settings/nodemgmt.conf -fi +source /opt/idssys/nodemgmt/settings.conf source /opt/idssys/nodemgmt/defaults.inc if [[ "${noheader}" != *" ${1} "* ]] && [[ "${noheader}" != *" ${2} "* ]]; then