diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index b29c1b86..b7165c47 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -361,7 +361,7 @@ NODEUPDATES() { if [ ! -f /tmp/.nodeupdate.${NM_HOSTNAMES[${nip}]// /-}.running ]; then if [[ ${RUN_NODE_IP} != *"${nip}"* ]]; then touch /tmp/.nodeupdate.${NM_HOSTNAMES[${nip}]// /-}.running - # NODEUPDATE "${nip}" "${2}" "${NMCMD}" & + NODEUPDATE "${nip}" "${2}" "${NMCMD}" & ((ncount++)) fi fi @@ -404,47 +404,47 @@ NODEUPDATE(){ NODE="${NM_HOSTNAMES[${nip}]} [${nip}]" tmpfile=/tmp/.nodeupdate.${NM_HOSTNAMES[${nip}]// /-} - if [ ${noup} -eq 0 ]; then - c=0; spca=''; spc1=`expr ${cw} - ${#NODE}`; until [ $c = ${spc1} ]; do spca="${spca} "; c=`expr $c + 1`; done - echo -en "Updating ${NODE}${spca}" >> ${tmpfile}.running - fi - betacheck=$(BETACHECK) - - if [ "${nip}" != "100.100.2.1" ] && [ "${nip}" != "${NM_OFFSITE_GW_IP}" ] && [ ! -f ${NM_TMPFOLDER}/${nip}.down ] && [ "$(CHECK_HOST ${nip})" != "false" ]; then - 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 - else - ${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 - ${NMCMD} rsync -az ${NM_FOLDER}/conf/powerwall ${NM_FOLDER}/conf/*.conf root@${nip}:${NM_FOLDER}/conf/ >/dev/null 2>&1 - echo -e "${idsCL[Green]}Files Synced${idsCL[Default]}" >> ${tmpfile}.running - fi - else - echo -e "${idsCL[LightCyan]}Skipping BETA Update${idsCL[Default]}" >> ${tmpfile}.running - fi - elif [ -f ${NM_TMPFOLDER}/${nip}.down ]; then - echo -e "${idsCL[LightCyan]}Skipping, host is offline${idsCL[Default]}" >> ${tmpfile}.running - else - echo -e "${idsCL[LightCyan]}Skipping${idsCL[Default]}" >> ${tmpfile}.running - fi - [ -f ${tmpfile}.running ] && mv ${tmpfile}.running ${tmpfile}.done || touch ${tmpfile}.done + # if [ ${noup} -eq 0 ]; then + # c=0; spca=''; spc1=`expr ${cw} - ${#NODE}`; until [ $c = ${spc1} ]; do spca="${spca} "; c=`expr $c + 1`; done + # echo -en "Updating ${NODE}${spca}" >> ${tmpfile}.running + # fi + # betacheck=$(BETACHECK) + # + # if [ "${nip}" != "100.100.2.1" ] && [ "${nip}" != "${NM_OFFSITE_GW_IP}" ] && [ ! -f ${NM_TMPFOLDER}/${nip}.down ] && [ "$(CHECK_HOST ${nip})" != "false" ]; then + # 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 + # else + # ${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 + # ${NMCMD} rsync -az ${NM_FOLDER}/conf/powerwall ${NM_FOLDER}/conf/*.conf root@${nip}:${NM_FOLDER}/conf/ >/dev/null 2>&1 + # echo -e "${idsCL[Green]}Files Synced${idsCL[Default]}" >> ${tmpfile}.running + # fi + # else + # echo -e "${idsCL[LightCyan]}Skipping BETA Update${idsCL[Default]}" >> ${tmpfile}.running + # fi + # elif [ -f ${NM_TMPFOLDER}/${nip}.down ]; then + # echo -e "${idsCL[LightCyan]}Skipping, host is offline${idsCL[Default]}" >> ${tmpfile}.running + # else + # echo -e "${idsCL[LightCyan]}Skipping${idsCL[Default]}" >> ${tmpfile}.running + # fi + # [ -f ${tmpfile}.running ] && mv ${tmpfile}.running ${tmpfile}.done || touch ${tmpfile}.done } ADD_LOGROTATE_CRONTAB(){