diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index af81f2db..890eff95 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -36,11 +36,13 @@ STATUS(){ echo -e "${idsCL[LightCyan]}Setting up status checks...${idsCL[Default]}" echo fi - if [ ! -z ${LOCAL_SERVICES+x} ]; - then NHCMD="ssh root@${NODE_HOSTS[0]}" - else NHCMD='' + if [ ! -z ${LOCAL_SERVICES+x} ]; then + NHCMD="ssh root@${NODE_HOSTS[0]}" + WHCMD="ssh root@${WEB_HOSTS[0]}" + else + NHCMD='' fi - for rcheck in "${REPL_CHECK[@]}"; do + for rcheck in "${NODE_REPL_CHECK[@]}"; do ${NHCMD} rm -f ${FOLDER}/test.repl daterun=`date +%Y-%m-%d-%H-%M-%S` if [ "${NHCMD}" = "" ]; then @@ -51,6 +53,17 @@ STATUS(){ yes | ${NHCMD} "cp -rfH ${FOLDER}/test.repl ${REPL_CHECKS[${rcheck}]}/test.repl" fi done + for rcheck in "${WEB_REPL_CHECK[@]}"; do + ${WHCMD} rm -f ${FOLDER}/test.repl + daterun=`date +%Y-%m-%d-%H-%M-%S` + if [ "${WHCMD}" = "" ]; then + echo -e "iDS-Webserver${nid} (${nip})\n${daterun}" > ${FOLDER}/test.repl + yes | cp -rfH ${FOLDER}/test.repl ${REPL_CHECKS[${rcheck}]}/test.repl + else + ${WHCMD} "echo -e \"Status-Check (${NODE_HOSTNAME})\n${daterun}\" > ${FOLDER}/test.repl" + yes | ${WHCMD} "cp -rfH ${FOLDER}/test.repl ${REPL_CHECKS[${rcheck}]}/test.repl" + fi + done if [ "${ST_ACTION}" = "repl" ]; then sleep 5 fi @@ -310,7 +323,7 @@ STATUS(){ if [ "${nip}" = "${NODE_HOSTS[0]}" ] && [ ! -z ${LOCAL_SERVICES+x} ]; then isreplhost=true; else isreplhost=false; fi if [[ $(/sbin/ip -o -4 addr list ens192 | awk '{print $4}' | cut -d/ -f1) != *"${nip}"* ]] && [ "${isreplhost}" = "false" ]; then if [ "${ST_ACTION}" != "check" ]; then - echo -e " ${idsST[Bold]}${idsCL[LightCyan]}iDS-MySQL${nid} (${nip})${idsST[Reset]}${idsCL[Default]}" + echo -e " ${idsCL[LightCyan]}iDS-MySQL1 (${NODE_HOSTS[0]}) <--> ${idsST[Bold]}iDS-MySQL${nid} (${nip})${idsST[Reset]}${idsCL[Default]}" DIVIDER false green fi checkhost=$(CHECK_HOST ${nip}) @@ -376,7 +389,7 @@ STATUS(){ if [ "${nip}" = "${WEB_HOSTS[0]}" ] && [ ! -z ${LOCAL_SERVICES+x} ]; then isreplhost=true; else isreplhost=false; fi if [[ $(/sbin/ip -o -4 addr list ens192 | awk '{print $4}' | cut -d/ -f1) != *"${nip}"* ]] && [ "${isreplhost}" = "false" ]; then if [ "${ST_ACTION}" != "check" ]; then - echo -e " ${idsST[Bold]}${idsCL[LightCyan]}iDS-Webserver${nid} (${nip})${idsST[Reset]}${idsCL[Default]}" + echo -e " ${idsCL[LightCyan]}iDS-Webserver1 (${WEB_HOSTS[0]}) <--> ${idsST[Bold]}iDS-Webserver${nid} (${nip})${idsST[Reset]}${idsCL[Default]}" DIVIDER false green fi checkhost=$(CHECK_HOST ${nip}) @@ -395,10 +408,10 @@ STATUS(){ fi checked=false until [ "${checked}" = "" ]; do - if [ "${NHCMD}" = "" ]; then + if [ "${WHCMD}" = "" ]; then checked=`ssh root@${nip} "cat ${REPL_CHECKS[${rcheck}]}/test.repl" | diff - ${REPL_CHECKS[${rcheck}]}/test.repl` else - checked="`${NHCMD} \"ssh root@${nip} \"cat ${REPL_CHECKS[${rcheck}]}/test.repl\" | diff - ${REPL_CHECKS[${rcheck}]}/test.repl\"`" + checked="`${WHCMD} \"ssh root@${nip} \"cat ${REPL_CHECKS[${rcheck}]}/test.repl\" | diff - ${REPL_CHECKS[${rcheck}]}/test.repl\"`" fi if [ "`date +%s`" -gt "$timeout" ]; then timeout=true