voltron/NodeMgmt
1
1
Fork 0
Code Issues Pull Requests Releases 1 Activity

update

Browse Source
This commit is contained in:
David Schroeder
2024-03-05 17:02:23 -06:00
parent 95f7843973
commit 15b40c20ca
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
defaults.inc
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
VERS='5.1.95-03052024' VERS='5.1.96-03052024'
NM_BETA=false 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 ' 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 '

15
inc/services.inc
View File

@@ -287,7 +287,18 @@ SERVICE_MGMT(){
if [ "${checkhost}" != "false" ] && [ "${nip}" != "${!NT_HOST}" ]; then if [ "${checkhost}" != "false" ] && [ "${nip}" != "${!NT_HOST}" ]; then
checked=false checked=false
until [ "${checked}" = "true" ]; do 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`" checked="`${PH_CMD} 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`"
done
fi
done
for nip in "${!NT_HOSTS}"; do
checkhost=$(CHECK_HOST ${nip})
if [ "${checkhost}" != "false" ] && [ "${nip}" != "${!NT_HOST}" ]; then
unset checked1 checked2
until [ "${checked1}" = "true" ]; do
until [ "${checked2}" = "true" ]; do checked2="`${PH_CMD} [ -f ${NM_REPL_CHECK_LOC[${SERVICE['service']}]}/test.repl ] && echo true`"; sleep 1s; done
checked1="`${PH_CMD} [ $(expr $(date +%s) - $(stat -L --format %Y ${NM_REPL_CHECK_LOC[${SERVICE['service']}]}/test.repl)) -le 90 ] && echo true`"
done done
fi fi
done done
@@ -307,7 +318,7 @@ SERVICE_MGMT(){
for nip in "${!NT_HOSTS}"; do for nip in "${!NT_HOSTS}"; do
checkhost=$(CHECK_HOST ${nip}) checkhost=$(CHECK_HOST ${nip})
if [ "${checkhost}" != "false" ] && [ "${nip}" != "${!NT_HOST}" ]; then if [ "${checkhost}" != "false" ] && [ "${nip}" != "${!NT_HOST}" ]; then
checked=false unset checked1 checked2
until [ "${checked1}" = "true" ]; do until [ "${checked1}" = "true" ]; do
until [ "${checked2}" = "true" ]; do checked2="`${PH_CMD} [ -f ${NM_REPL_CHECK_LOC[${SERVICE['service']}]}/test.repl ] && echo true`"; sleep 1s; done until [ "${checked2}" = "true" ]; do checked2="`${PH_CMD} [ -f ${NM_REPL_CHECK_LOC[${SERVICE['service']}]}/test.repl ] && echo true`"; sleep 1s; done
checked1="`${PH_CMD} [ $(expr $(date +%s) - $(stat -L --format %Y ${NM_REPL_CHECK_LOC[${SERVICE['service']}]}/test.repl)) -le 90 ] && echo true`" checked1="`${PH_CMD} [ $(expr $(date +%s) - $(stat -L --format %Y ${NM_REPL_CHECK_LOC[${SERVICE['service']}]}/test.repl)) -le 90 ] && echo true`"