Update nodemgmt-scripts.sh
This commit is contained in:
@@ -361,7 +361,7 @@ NODEUPDATES() {
|
|||||||
if [ ! -f /tmp/.nodeupdate.${NM_HOSTNAMES[${nip}]// /-}.running ]; then
|
if [ ! -f /tmp/.nodeupdate.${NM_HOSTNAMES[${nip}]// /-}.running ]; then
|
||||||
if [[ ${RUN_NODE_IP} != *"${nip}"* ]]; then
|
if [[ ${RUN_NODE_IP} != *"${nip}"* ]]; then
|
||||||
touch /tmp/.nodeupdate.${NM_HOSTNAMES[${nip}]// /-}.running
|
touch /tmp/.nodeupdate.${NM_HOSTNAMES[${nip}]// /-}.running
|
||||||
NODEUPDATE "${nip}" "${2}" "${NMCMD}" &
|
# NODEUPDATE "${nip}" "${2}" "${NMCMD}" &
|
||||||
((ncount++))
|
((ncount++))
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
@@ -378,7 +378,7 @@ NODEUPDATES() {
|
|||||||
((nc_count++))
|
((nc_count++))
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
if [ ${nc_count} -eq ${ncount} ]; then
|
if [ ${nc_count} -eq ${ncount} ] || [ ! -f /tmp/.nodeupdate.*.done ]; then
|
||||||
completed=true
|
completed=true
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
@@ -414,23 +414,22 @@ NODEUPDATE(){
|
|||||||
if [ "${betacheck}" == "false" ]; then
|
if [ "${betacheck}" == "false" ]; then
|
||||||
if [ "${2}" != "sync" ]; then
|
if [ "${2}" != "sync" ]; then
|
||||||
# [ ${noup} -eq 0 ] && echo -en " ~ ${idsCL[LightCyan]}NodeMGMT${idsCL[Default]} : " >> ${tmpfile}.running
|
# [ ${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
|
||||||
# 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]}"
|
||||||
# echo -e "${idsCL[Yellow]}[${nip}] New server, needs SSH credentials${idsCL[Default]}"
|
ssh-copy-id root@${nip}
|
||||||
# ssh-copy-id root@${nip}
|
fi
|
||||||
# fi
|
if ! ${NCMD} command -v nodemgmt > /dev/null; then
|
||||||
# if ! ${NCMD} command -v nodemgmt > /dev/null; then
|
${NCMD} "bash <(curl -sL https://go.scity.us/install-nodemgmt)" >/dev/null 2>&1
|
||||||
# ${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/*.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
|
||||||
# ${NMCMD} rsync -az ${NM_FOLDER}/conf/powerwall ${NM_FOLDER}/conf/*.conf root@${nip}:${NM_FOLDER}/conf/ >/dev/null 2>&1
|
sleep 2s
|
||||||
# sleep 2s
|
[ "${NM_GITPASS}" != "" ] && [ "${NM_GITUSER^^}" == "VOLTRON" ] && ${NMCMD} "bash <(curl -sL https://go.scity.us/add-linux-pass)" >/dev/null 2>&1
|
||||||
# [ "${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
|
||||||
# echo -e "${idsCL[Green]}Installed & Synced${idsCL[Default]}" >> ${tmpfile}.running
|
elif [ ${noup} -eq 1 ]; then
|
||||||
# elif [ ${noup} -eq 1 ]; then
|
echo -e "${idsCL[Green]}Already Installed${idsCL[Default]}" >> ${tmpfile}.running
|
||||||
# echo -e "${idsCL[Green]}Already Installed${idsCL[Default]}" >> ${tmpfile}.running
|
else
|
||||||
# else
|
|
||||||
${NCMD} "nodemgmt update q" >> ${tmpfile}.running
|
${NCMD} "nodemgmt update q" >> ${tmpfile}.running
|
||||||
# fi
|
fi
|
||||||
else
|
else
|
||||||
# echo -en " ~ ${idsCL[LightCyan]}Sync Shared Nodemgmt Defaults${idsCL[Default]} : " >> ${tmpfile}.running
|
# 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/*.inc ${NM_FOLDER}/conf/*.conf root@${nip}:${NM_FOLDER}/conf/ & >/dev/null 2>&1
|
||||||
|
|||||||
Reference in New Issue
Block a user