From f742c8e861bf1f848dcd15806abbf14d32a70fd0 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 6 Aug 2023 18:23:21 -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 8fe47421..4327bba8 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ #!/usr/bin/env bash -VERS='4.10.44-08062023' +VERS='4.10.45-08062023' noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns ' CERT_DAEMON='/snap/bin/certbot' diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index a22c3879..d0deff0a 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -341,6 +341,7 @@ NODEUPDATE() { echo nmdiv=$(ssh -tq root@${nmip} ls -l --time-style=+%s ${NM_FOLDER}/conf/defaults.local.inc | cut -d ' ' -f 6) + nmsdc=$(ssh -tq root@${nmip} ls -l --time-style=+%s ${NM_FOLDER}/conf/ssl-domain-checks.conf | cut -d ' ' -f 6) for NTYPE in "${NM_NODE_TYPES[@]}"; do nid=1 @@ -374,7 +375,7 @@ NODEUPDATE() { else echo -en " ~ ${idsCL[LightCyan]}Sync Defaults${idsCL[Default]} : " - if ssh -tq root@${nip} [[ ! -f ${NM_FOLDER}/conf/defaults.local.inc ]] || [ ${nmdiv} -ne $(ssh -tq root@${nip} ls -l --time-style=+%s ${NM_FOLDER}/conf/defaults.local.inc | cut -d ' ' -f 6) ]; then + if ssh -tq root@${nip} [[ ! -f ${NM_FOLDER}/conf/defaults.local.inc ]] || [ ${nmdiv} -ne $(ssh -tq root@${nip} ls -l --time-style=+%s ${NM_FOLDER}/conf/defaults.local.inc | cut -d ' ' -f 6) ] || [ ${nmsdc} -ne $(ssh -tq root@${nip} ls -l --time-style=+%s ${NM_FOLDER}/conf/ssl-domain-checks.conf | cut -d ' ' -f 6) ]; then ssh -tq root@${nmip} rsync -az ${NM_FOLDER}/conf/defaults.local.inc ${NM_FOLDER}/conf/ssl-domain-checks.conf root@${nip}:${NM_FOLDER}/ >/dev/null 2>&1 echo -e "${idsCL[Green]}NodeMgmt Defaults File Synced${idsCL[Default]}" else