This commit is contained in:
2024-11-29 13:48:42 -06:00
parent f83d8ce917
commit 8e66e59628
3 changed files with 11 additions and 11 deletions

View File

@@ -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 '

View File

@@ -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[@]

2
run.sh
View File

@@ -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]}"