From fdce140c72168f31c55721173305230ab4725a2a Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Tue, 29 Jan 2019 11:00:35 -0600 Subject: [PATCH] update vers info --- defaults.inc | 3 +++ nodemgmt-scripts.sh | 5 +++-- run.sh | 5 +++-- 3 files changed, 9 insertions(+), 4 deletions(-) create mode 100755 defaults.inc diff --git a/defaults.inc b/defaults.inc new file mode 100755 index 00000000..679b9842 --- /dev/null +++ b/defaults.inc @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +VERS='1.01292019' diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 9ef42763..87f263f4 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -6,10 +6,11 @@ action="$1" CERT_DAEMON='/usr/bin/certbot' NODE_SERVICES=mysql,nginx,gitea,haproxy,keepalived,maxscale -source /opt/idssys/nodemgmt/settings.conf source /opt/idssys/defaults/colors.inc source /opt/idssys/defaults/default.inc -VERS=`${ids_mysql_conn} -s -N -e "SELECT value FROM idssys.nodemgmt WHERE var = 'VERS'"` +source /opt/idssys/nodemgmt/settings.conf +source /opt/idssys/nodemgmt/defaults.inc + if [ "$1" = "service" ] || [ "$1" = "set-permissions" ] || [ "$1" = "status" ]; then NODE_HOSTS=`${ids_mysql_conn} -s -N -e "SELECT value FROM idssys.nodemgmt WHERE var = 'NODE_HOSTS'"` fi diff --git a/run.sh b/run.sh index 1cb72617..b1d97d6b 100755 --- a/run.sh +++ b/run.sh @@ -1,10 +1,11 @@ #!/usr/bin/env bash # NodeMgmt Loader -source /opt/idssys/nodemgmt/settings.conf source /opt/idssys/defaults/colors.inc source /opt/idssys/defaults/default.inc -VERS=`${ids_mysql_conn} -s -N -e "SELECT value FROM idssys.nodemgmt WHERE var = 'VERS'"` +source /opt/idssys/nodemgmt/settings.conf +source /opt/idssys/nodemgmt/defaults.inc + NODE_SERVICES=mysql,nginx,gitea,haproxy,keepalived,maxscale IFS=, NODE_SERVICES=(${NODE_SERVICES})