From bf84e2c2153df5936d091f376ee13fc7088bff1e Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Fri, 23 Jun 2023 19:32:14 -0500 Subject: [PATCH] update --- defaults.inc | 2 +- nodemgmt-scripts.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/defaults.inc b/defaults.inc index 37341e9b..3ca61212 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='4.7.126-06212023' +VERS='4.7.127-06212023' # NODETYPES=WEB NODETYPES=LB,LPD,MM,MYSQL,NC,PW,WPD,WM,WEB diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 56b814bf..5cc9af82 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -520,7 +520,6 @@ SERVICE(){ else PH_CMD="ssh root@${!NT_HOST}" fi - echo $PH_CMD ${PH_CMD} touch ${NGINX_PATHS[${NODE_TYPE}]}/test.repl # ${PH_CMD} "echo -e \"Service ${1} ${2}\" >> ${NGINX_PATHS[${NODE_TYPE}]}/test.repl" for nip in "${!NT_HOSTS}"; do @@ -530,6 +529,8 @@ SERVICE(){ checked=false until [ "${checked}" = "" ]; 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} 'if [ -f /etc/nginx/test.repl ]; then cat /etc/letsencrypt/test.repl; fi' | diff - /etc/letsencrypt/test.repl\"`" done fi