This commit is contained in:
2024-01-11 11:07:37 -06:00
parent 18aa6ce61d
commit c24fb6debe
6 changed files with 113 additions and 86 deletions

View File

@@ -29,8 +29,8 @@ SINGLE_SERVER_SERVICE_CHECK(){
[ "${stc}" = "pdnsadmin" ] && stc="pdnsadmin.service pdnsadmin.socket"
for nip in "${!hosts}"; do
if [[ "${RUN_NODE_IP}" != *"${nip}"* ]] && [ "$(CHECK_HOST ${nip})" != "false" ]; then
ssh -tq root@${nip} /bin/systemctl stop ${stc}
ssh -tq root@${nip} rm -f ${NM_TMPFOLDER}/.singleserver
ssh -tq -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip} /bin/systemctl stop ${stc}
ssh -tq -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip} rm -f ${NM_TMPFOLDER}/.singleserver
fi
done
sleep 3s
@@ -54,8 +54,8 @@ SINGLE_SERVER_SERVICE_CHECK(){
else
if [ "$(CHECK_HOST ${nip})" != "false" ]; then
[ "$(ssh root@${nip} /usr/bin/docker ps -q -f name=${docker})" ] && ssh root@${nip} /usr/bin/docker stop ${docker} >/dev/null 2>&1
[ "${docker}" == "authelia" ] && [ "$(ssh root@${nip} /usr/bin/docker ps -q -f name=auth_redis)" ] && ssh root@${nip} /usr/bin/docker stop auth_redis >/dev/null 2>&1
[ "$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip} /usr/bin/docker ps -q -f name=${docker})" ] && ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip} /usr/bin/docker stop ${docker} >/dev/null 2>&1
[ "${docker}" == "authelia" ] && [ "$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip} /usr/bin/docker ps -q -f name=auth_redis)" ] && ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip} /usr/bin/docker stop auth_redis >/dev/null 2>&1
fi
fi
done
@@ -163,7 +163,7 @@ SERVICE_MGMT(){
nip='localhost '
NCMD=''
else
NCMD="ssh -o ConnectTimeout=3 root@${nip}"
NCMD="ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip}"
fi
[ ${QUIET} -eq 0 ] && echo -en "${NM_SRVCOPTS[${SERVICE['action']}]}ing on '$nip'... ${idsCL[Default]}"
@@ -197,7 +197,7 @@ SERVICE_MGMT(){
nip='localhost '
NCMD=''
else
NCMD="ssh -o ConnectTimeout=3 root@${nip}"
NCMD="ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip}"
fi
if [ ${QUIET} -eq 0 ]; then
@@ -279,7 +279,7 @@ SERVICE_MGMT(){
if [[ "${RUN_NODE_IP}" == *"${!NT_HOST}"* ]]; then
PH_CMD=""
else
PH_CMD="ssh root@${!NT_HOST}"
PH_CMD="ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${!NT_HOST}"
fi
${PH_CMD} touch ${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}/test.repl
# ${PH_CMD} "echo -e \"Service ${SERVICE['service']} ${SERVICE['action']}\" >> ${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}/test.repl"
@@ -288,7 +288,7 @@ SERVICE_MGMT(){
if [ "${checkhost}" != "false" ] && [ "${nip}" != "${!NT_HOST}" ]; then
checked=false
until [ "${checked}" = "true" ]; do
checked="`${PH_CMD} ssh root@${nip} [ -f ${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}/test.repl ] && [ $(expr $(date +%s) - $(stat -L --format %Y ${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}/test.repl)) -le 90 ] && echo true`"
checked="`${PH_CMD} ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip} [ -f ${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}/test.repl ] && [ $(expr $(date +%s) - $(stat -L --format %Y ${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}/test.repl)) -le 90 ] && echo true`"
done
fi
done
@@ -302,7 +302,7 @@ SERVICE_MGMT(){
if [[ "${RUN_NODE_IP}" == *"${!NT_HOST}"* ]]; then
PH_CMD=""
else
PH_CMD="ssh root@${!NT_HOST}"
PH_CMD="ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${!NT_HOST}"
fi
${PH_CMD} touch ${NM_REPL_CHECK_LOC[${SERVICE['service']}]}/test.repl
for nip in "${!NT_HOSTS}"; do
@@ -310,7 +310,7 @@ SERVICE_MGMT(){
if [ "${checkhost}" != "false" ] && [ "${nip}" != "${!NT_HOST}" ]; then
checked=false
until [ "${checked}" = "true" ]; do
checked="`${PH_CMD} ssh root@${nip} [ -f ${NM_REPL_CHECK_LOC[${SERVICE['service']}]}/test.repl ] && [ $(expr $(date +%s) - $(stat -L --format %Y ${NM_REPL_CHECK_LOC[${SERVICE['service']}]}/test.repl)) -le 90 ] && echo true`"
checked="`${PH_CMD} ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip} [ -f ${NM_REPL_CHECK_LOC[${SERVICE['service']}]}/test.repl ] && [ $(expr $(date +%s) - $(stat -L --format %Y ${NM_REPL_CHECK_LOC[${SERVICE['service']}]}/test.repl)) -le 90 ] && echo true`"
done
fi
done
@@ -354,7 +354,7 @@ SERVICE_MGMT(){
nip='localhost '
NCMD=''
else
NCMD="ssh -o ConnectTimeout=3 root@${nip}"
NCMD="ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip}"
fi
NOGOCHK=true;
@@ -377,7 +377,7 @@ SERVICE_MGMT(){
if [ "${SERVICE['service']}"= = "offsite-power-check" ]; then
if [ ${QUIET} -eq 0 ] && [ "${SERVICE['action']}" != "status" ]; then
if [ "$(ssh root@${nip} ps -U root | grep "offsite-power-check.sh start" | grep -v "grep" | awk '{print $1}')" != "" ]; then
if [ "$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip} ps -U root | grep "offsite-power-check.sh start" | grep -v "grep" | awk '{print $1}')" != "" ]; then
echo -e "${idsCL[Green]}Done${idsCL[Default]}"
else
echo -e "${idsCL[Red]}Not Running${idsCL[Default]}"