diff --git a/defaults.inc b/defaults.inc index 3ca61212..390447df 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='4.7.127-06212023' +VERS='4.7.128-06212023' # NODETYPES=WEB NODETYPES=LB,LPD,MM,MYSQL,NC,PW,WPD,WM,WEB diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index a6806991..11548de8 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -527,11 +527,11 @@ SERVICE(){ if [ "${checkhost}" != "false" ]; then if [ "${nip}" != "${!NT_HOST}" ]; then checked=false - until [ "${checked}" = "" ]; do + until [ "${checked}" = "true" ]; do # checked="`${PH_CMD} \"ssh root@${nip} '[ -f ${NGINX_PATHS[${NODE_TYPE}]}/test.repl ] && cat -u ${NGINX_PATHS[${NODE_TYPE}]}/test.repl' | diff -q - ${NGINX_PATHS[${NODE_TYPE}]}/test.repl\"`" - checked="`${PH_CMD} \"ssh root@${nip} '[ -f '${NGINX_PATHS[${NODE_TYPE}]}'/test.repl ] && [ $(expr $(date +%s) - $(stat -L --format %Y '${NGINX_PATHS[${NODE_TYPE}]}'/test.repl)) -le 10 ] && echo true'\"`" + # checked="`${PH_CMD} \"ssh root@${nip} '[ -f '${NGINX_PATHS[${NODE_TYPE}]}'/test.repl ] && [ $(expr $(date +%s) - $(stat -L --format %Y '${NGINX_PATHS[${NODE_TYPE}]}'/test.repl)) -le 10 ] && echo true'\"`" + checked="`${PH_CMD} ssh root@${nip} [ -f ${NGINX_PATHS[${NODE_TYPE}]}/test.repl ] && [ $(expr $(date +%s) - $(stat -L --format %Y ${NGINX_PATHS[${NODE_TYPE}]}/test.repl)) -le 90 ] && echo true`" - # checked="`${PH_CMD} \"ssh root@${nip} 'if [ -f /etc/nginx/test.repl ]; then cat /etc/letsencrypt/test.repl; fi' | diff - /etc/letsencrypt/test.repl\"`" done fi fi