From a39e1c6e89cae6472efffc4aadd0303af97ea4ef Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Tue, 29 Jan 2019 11:03:49 -0600 Subject: [PATCH] remove mysql --- defaults.inc | 8 ++++++++ nodemgmt-scripts.sh | 12 ------------ run.sh | 4 ---- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/defaults.inc b/defaults.inc index 679b9842..b0ab799a 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,3 +1,11 @@ #!/usr/bin/env bash VERS='1.01292019' +NODE_HOSTS=10.5.10.51,10.5.10.52,10.5.10.53 +NODE_SERVICES=mysql,nginx,gitea,haproxy,keepalived,maxscale +CERT_DAEMON='/usr/bin/certbot' + +IFS=, +NODE_HOSTS=(${NODE_HOSTS}) +NODE_SERVICES=(${NODE_SERVICES}) +unset IFS diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 87f263f4..d6a66197 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -3,23 +3,11 @@ action="$1" -CERT_DAEMON='/usr/bin/certbot' -NODE_SERVICES=mysql,nginx,gitea,haproxy,keepalived,maxscale - source /opt/idssys/defaults/colors.inc source /opt/idssys/defaults/default.inc 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 - -IFS=, -NODE_HOSTS=(${NODE_HOSTS}) -NODE_SERVICES=(${NODE_SERVICES}) -unset IFS - # ========================================================= # diff --git a/run.sh b/run.sh index b1d97d6b..33473e55 100755 --- a/run.sh +++ b/run.sh @@ -6,10 +6,6 @@ source /opt/idssys/defaults/default.inc 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}) -unset IFS if [ "$1" != "service" ] && [ "$1" != "status" ]; then echo ""