From 4194cd57387dcd8bdade4cceb3d072aa9e228c3f Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Tue, 14 Nov 2023 19:55:20 -0600 Subject: [PATCH] Update nodemgmt-scripts.sh --- nodemgmt-scripts.sh | 78 +++++++++++++++++++++++---------------------- 1 file changed, 40 insertions(+), 38 deletions(-) diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 45de947a..fd2b4732 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -348,51 +348,53 @@ NODEUPDATE() { nid=1 var=${NTYPE}_HOSTS[@] for nip in "${!var}"; do - if [[ ${RUN_NODE_IP} == *"${nip}"* ]]; then - nip='localhost ' - fi - NCMD="ssh -tq root@${nip}" - NODE=${NM_HOSTNAMES[${nip}]}[${nip}] - c=0; spca=''; spc1=${cw}-${#NODE}; until [ $c = ${spc1} ]; do spca="${spca} "; c=`expr $c + 1`; done - echo -en "Updating ${NODE}${spca}" - - if [ "${2}" != "sync" ]; then - echo -en " ~ ${idsCL[LightCyan]}NodeMGMT${idsCL[Default]} : " - if ! ${NCMD} command -v nodemgmt > /dev/null; then - ${NCMD} "bash <(curl -sL https://go.scity.us/install-nodemgmt)" >/dev/null 2>&1 - ${NMCMD} rsync -az ${NM_FOLDER}/conf/defaults.local.inc ${NM_FOLDER}/conf/ssl-domain-checks.conf root@${nip}:${NM_FOLDER}/conf/ & >/dev/null 2>&1 - echo -e "${idsCL[Green]}Installed & Synced${idsCL[Default]}" - else - echo shhh - # ${NCMD} "nodemgmt update q" + if [ "${nip}" != "100.100.2.1" ] || [ "${nip}" != "10.2.1.1" ]; then + if [[ ${RUN_NODE_IP} == *"${nip}"* ]]; then + nip='localhost ' fi + NCMD="ssh -tq root@${nip}" + NODE=${NM_HOSTNAMES[${nip}]}[${nip}] + c=0; spca=''; spc1=${cw}-${#NODE}; until [ $c = ${spc1} ]; do spca="${spca} "; c=`expr $c + 1`; done + echo -en "Updating ${NODE}${spca}" - # echo -en " ~ ${idsCL[LightCyan]}LinUPx${idsCL[Default]} : " - # if ! ${NCMD} command -v runup > /dev/null; then - # ${NCMD} bash <(curl -sL https://go.scity.us/install-linupx) >/dev/null 2>&1 - # else - # ${NCMD} "runup runup" >/dev/null 2>&1 - # fi - # echo -e "${idsCL[Green]}Updated${idsCL[Default]}" + if [ "${2}" != "sync" ]; then + echo -en " ~ ${idsCL[LightCyan]}NodeMGMT${idsCL[Default]} : " + if ! ${NCMD} command -v nodemgmt > /dev/null; then + ${NCMD} "bash <(curl -sL https://go.scity.us/install-nodemgmt)" >/dev/null 2>&1 + ${NMCMD} rsync -az ${NM_FOLDER}/conf/defaults.local.inc ${NM_FOLDER}/conf/ssl-domain-checks.conf root@${nip}:${NM_FOLDER}/conf/ & >/dev/null 2>&1 + echo -e "${idsCL[Green]}Installed & Synced${idsCL[Default]}" + else + echo shhh + # ${NCMD} "nodemgmt update q" + fi - else - nmdiv=$(${NMCMD} ls -l --time-style=+%s ${NM_FOLDER}/conf/defaults.local.inc | cut -d ' ' -f 6) - nmsdc=$(${NMCMD} ls -l --time-style=+%s ${NM_FOLDER}/conf/ssl-domain-checks.conf | cut -d ' ' -f 6) + # echo -en " ~ ${idsCL[LightCyan]}LinUPx${idsCL[Default]} : " + # if ! ${NCMD} command -v runup > /dev/null; then + # ${NCMD} bash <(curl -sL https://go.scity.us/install-linupx) >/dev/null 2>&1 + # else + # ${NCMD} "runup runup" >/dev/null 2>&1 + # fi + # echo -e "${idsCL[Green]}Updated${idsCL[Default]}" + + else + nmdiv=$(${NMCMD} ls -l --time-style=+%s ${NM_FOLDER}/conf/defaults.local.inc | cut -d ' ' -f 6) + nmsdc=$(${NMCMD} ls -l --time-style=+%s ${NM_FOLDER}/conf/ssl-domain-checks.conf | cut -d ' ' -f 6) - echo -en " ~ ${idsCL[LightCyan]}Sync Shared Nodemgmt Defaults${idsCL[Default]} : " - if ssh -tq root@${nip} [[ ! -f ${NM_FOLDER}/conf/defaults.local.inc ]] || - ssh -tq root@${nip} [[ ! -f ${NM_FOLDER}/conf/ssl-domain-checks.conf ]] || - [ ${nmdiv} -ne $(ssh -tq root@${nip} ls -l --time-style=+%s ${NM_FOLDER}/conf/defaults.local.inc | cut -d ' ' -f 6) ] || - [ ${nmsdc} -ne $(ssh -tq root@${nip} ls -l --time-style=+%s ${NM_FOLDER}/conf/ssl-domain-checks.conf | cut -d ' ' -f 6) ]; then - ${NMCMD} rsync -az ${NM_FOLDER}/conf/defaults.local.inc ${NM_FOLDER}/conf/ssl-domain-checks.conf root@${nip}:${NM_FOLDER}/conf/ & >/dev/null 2>&1 - echo -e "${idsCL[Green]}Files Synced${idsCL[Default]}" - else - echo -e "${idsCL[Green]}Files Already Synced${idsCL[Default]}" + echo -en " ~ ${idsCL[LightCyan]}Sync Shared Nodemgmt Defaults${idsCL[Default]} : " + if ssh -tq root@${nip} [[ ! -f ${NM_FOLDER}/conf/defaults.local.inc ]] || + ssh -tq root@${nip} [[ ! -f ${NM_FOLDER}/conf/ssl-domain-checks.conf ]] || + [ ${nmdiv} -ne $(ssh -tq root@${nip} ls -l --time-style=+%s ${NM_FOLDER}/conf/defaults.local.inc | cut -d ' ' -f 6) ] || + [ ${nmsdc} -ne $(ssh -tq root@${nip} ls -l --time-style=+%s ${NM_FOLDER}/conf/ssl-domain-checks.conf | cut -d ' ' -f 6) ]; then + ${NMCMD} rsync -az ${NM_FOLDER}/conf/defaults.local.inc ${NM_FOLDER}/conf/ssl-domain-checks.conf root@${nip}:${NM_FOLDER}/conf/ & >/dev/null 2>&1 + echo -e "${idsCL[Green]}Files Synced${idsCL[Default]}" + else + echo -e "${idsCL[Green]}Files Already Synced${idsCL[Default]}" + fi + fi + nid=`expr $nid + 1` fi - - nid=`expr $nid + 1` done echo done