diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 7c75313b..d2aefa2a 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -410,9 +410,10 @@ NODEUPDATE(){ 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 + 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 + echo # # [ ${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]}" @@ -430,20 +431,20 @@ NODEUPDATE(){ # 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 + 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 }