diff --git a/defaults.inc b/defaults.inc index 56698d50..aa680b76 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='5.4.6-04202025' +VERS='5.4.7-04202025' 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/inc/services.inc b/inc/services.inc index 60a3e044..d087e435 100755 --- a/inc/services.inc +++ b/inc/services.inc @@ -286,7 +286,6 @@ SERVICE_MGMT(){ checked=false until [ "${checked}" = "true" ]; do checked="`${PH_CMD} ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} [ -f ${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}/.test.repl ] && [ $(expr $(date +%s) - $(stat -L --format %Y ${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}/.test.repl)) -le 90 ] && echo true || echo false`" - echo "${checked} = [${nip}] $(expr $(date +%s) - $(stat -L --format %Y ${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}/.test.repl))" done fi done @@ -296,9 +295,7 @@ SERVICE_MGMT(){ if [ "${checkhost}" != "false" ] && [ "${nip}" != "${!NT_HOST}" ]; then unset checked1 checked2 until [ "${checked1}" = "true" ]; do - echo -n "${checked1} = [${nip}] ${SERVICE['service']} - ${NM_REPL_CHECK_LOC[${SERVICE['service']}]}/.test.repl => " until [ "${checked2}" = "true" ]; do checked2="`${PH_CMD} [ -f ${NM_REPL_CHECK_LOC[${SERVICE['service']}]}/.test.repl ] && echo true`"; sleep 1s; done - echo "found" checked1="`${PH_CMD} [ $(expr $(date +%s) - $(stat -L --format %Y ${NM_REPL_CHECK_LOC[${SERVICE['service']}]}/.test.repl)) -le 90 ] && echo true`" done fi