From 2ccdb07b1496efd7e74fdb907e60ccd8a1e31972 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Fri, 29 Nov 2024 19:03:44 -0600 Subject: [PATCH] Update nodemgmt-scripts.sh --- nodemgmt-scripts.sh | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 1781b2d4..5ce683c8 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -414,22 +414,23 @@ NODEUPDATE(){ if [ "${betacheck}" == "false" ]; then if [ "${2}" != "sync" ]; then # [ ${noup} -eq 0 ] && echo -en " ~ ${idsCL[LightCyan]}NodeMGMT${idsCL[Default]} : " >> ${tmpfile}.running - if [ "$(ssh -o BatchMode=yes -o ConnectTimeout=3 root@${nip} echo ok 2>&1)" != "ok" ]; then - echo -e "${idsCL[Yellow]}[${nip}] New server, needs SSH credentials${idsCL[Default]}" - ssh-copy-id root@${nip} - fi - 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/*.inc ${NM_FOLDER}/conf/*.conf root@${nip}:${NM_FOLDER}/conf/ >/dev/null 2>&1 - ${NMCMD} rsync -az ${NM_FOLDER}/conf/powerwall ${NM_FOLDER}/conf/*.conf root@${nip}:${NM_FOLDER}/conf/ >/dev/null 2>&1 - sleep 2s - [ "${NM_GITPASS}" != "" ] && [ "${NM_GITUSER^^}" == "VOLTRON" ] && ${NMCMD} "bash <(curl -sL https://go.scity.us/add-linux-pass)" >/dev/null 2>&1 - echo -e "${idsCL[Green]}Installed & Synced${idsCL[Default]}" >> ${tmpfile}.running - elif [ ${noup} -eq 1 ]; then - echo -e "${idsCL[Green]}Already Installed${idsCL[Default]}" >> ${tmpfile}.running + + # if [ "$(ssh -o BatchMode=yes -o ConnectTimeout=3 root@${nip} echo ok 2>&1)" != "ok" ]; then + # echo -e "${idsCL[Yellow]}[${nip}] New server, needs SSH credentials${idsCL[Default]}" + # ssh-copy-id root@${nip} + # fi + # 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/*.inc ${NM_FOLDER}/conf/*.conf root@${nip}:${NM_FOLDER}/conf/ >/dev/null 2>&1 + # ${NMCMD} rsync -az ${NM_FOLDER}/conf/powerwall ${NM_FOLDER}/conf/*.conf root@${nip}:${NM_FOLDER}/conf/ >/dev/null 2>&1 + # sleep 2s + # [ "${NM_GITPASS}" != "" ] && [ "${NM_GITUSER^^}" == "VOLTRON" ] && ${NMCMD} "bash <(curl -sL https://go.scity.us/add-linux-pass)" >/dev/null 2>&1 + # echo -e "${idsCL[Green]}Installed & Synced${idsCL[Default]}" >> ${tmpfile}.running + # elif [ ${noup} -eq 1 ]; then + # echo -e "${idsCL[Green]}Already Installed${idsCL[Default]}" >> ${tmpfile}.running # else - # ${NCMD} "nodemgmt update q" >> ${tmpfile}.running - fi + ${NCMD} "nodemgmt update q" >> ${tmpfile}.running + # fi else # echo -en " ~ ${idsCL[LightCyan]}Sync Shared Nodemgmt Defaults${idsCL[Default]} : " >> ${tmpfile}.running ${NMCMD} rsync -az ${NM_FOLDER}/conf/*.inc ${NM_FOLDER}/conf/*.conf root@${nip}:${NM_FOLDER}/conf/ & >/dev/null 2>&1