diff --git a/defaults.inc b/defaults.inc index 0494781d..fa10210a 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='5.3.4-11292024' +VERS='5.3.5-11292024' NM_BETA=false noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update log betacheck offsite-staticroute-fix ' diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 4d40508a..4323446e 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -354,15 +354,15 @@ NODEUPDATES() { echo -e "${idsCL[LightGreen]}Updating All Nodes${idsCL[Default]}" echo -e "${idsCL[LightGreen]}-------------------------------------------${idsCL[Default]}" - [ "${RUN_NODE_TYPE}" == "nm" ] && NMCMD="" || NMCMD="ssh -tq -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_NODEMANAGER}" - betacheck=$(BETACHECK) - - if [ "${2}" != "sync" ]; then - c=0; spca=''; spc1=${cw}-25; until [ $c = ${spc1} ]; do spca="${spca} "; c=`expr $c + 1`; done - echo -en "Updating Node-Manager[${NM_NODEMANAGER}]${spca} ~ ${idsCL[LightCyan]}NodeMGMT${idsCL[Default]} : " - [ "${betacheck}" == "true" ] && echo -e "Skipping BETA Update" || ${NMCMD} "nodemgmt update q" - echo - fi + # [ "${RUN_NODE_TYPE}" == "nm" ] && NMCMD="" || NMCMD="ssh -tq -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_NODEMANAGER}" + # betacheck=$(BETACHECK) + # + # if [ "${2}" != "sync" ]; then + # c=0; spca=''; spc1=${cw}-25; until [ $c = ${spc1} ]; do spca="${spca} "; c=`expr $c + 1`; done + # echo -en "Updating Node-Manager[${NM_NODEMANAGER}]${spca} ~ ${idsCL[LightCyan]}NodeMGMT${idsCL[Default]} : " + # [ "${betacheck}" == "true" ] && echo -e "Skipping BETA Update" || ${NMCMD} "nodemgmt update q" + # echo + # fi ncount=0 for NTYPE in "${NM_NODE_TYPES[@]}"; do var=${NTYPE}_HOSTS[@] diff --git a/run.sh b/run.sh index 7831bf3f..3917d116 100755 --- a/run.sh +++ b/run.sh @@ -10,7 +10,7 @@ source /opt/idssys/nodemgmt/conf/settings.conf source /opt/idssys/nodemgmt/defaults.inc # if [[ "${noheader}" != *" ${1} "* ]] && [[ "${noheader}" != *" ${2} "* ]] && [ "${1}" != "status" ]; then -if [ "${1}" == "update" ]; then +if [ "${1}" == "update" ] || [ "${1}" == "update-nodes" ]; then if curl -m 3 -s --head --request GET https://git.schroedercity.com | grep "HTTP/2 200" > /dev/null; then if [ "${2}" != "q" ]; then echo -en "${idsCL[LightCyan]}Checking for updates...${idsCL[Default]}"