From 8a86b5b980821c51720112f5ffdb419aa68f295b Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 25 Nov 2023 18:57:56 -0600 Subject: [PATCH] update --- defaults.inc | 2 +- nodemgmt-scripts.sh | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/defaults.inc b/defaults.inc index 9dadd3fa..3302b678 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ #!/usr/bin/env bash -VERS='4.15.29-11252023' +VERS='4.15.30-11252023' 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 ' CERT_DAEMON='/snap/bin/certbot' diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 1f3c9d4a..90325b81 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -391,7 +391,7 @@ NODEUPDATE(){ ${NCMD} "nodemgmt update q" fi else - [ ${noup} -eq 0 ] && echo -en " ~ ${idsCL[LightCyan]}Sync Shared Nodemgmt Defaults${idsCL[Default]} : " + echo -en " ~ ${idsCL[LightCyan]}Sync Shared Nodemgmt Defaults${idsCL[Default]} : " ${NMCMD} rsync -az ${NM_FOLDER}/conf/defaults.local.inc ${NM_FOLDER}/conf/ssl-domain-checks.conf root@${nip}:${NM_FOLDER}/conf/ & >/dev/null 2>&1 echo -e "${idsCL[Green]}Files Synced${idsCL[Default]}" @@ -738,19 +738,16 @@ SETUPSSH(){ echo -e "${idsST[Bold]}"; DIVIDER echo -e "${idsCL[Yellow]} ${NM_NODETYPES[$NTYPE]}-Nodes - Verifying SSH Connection${idsCL[Default]}" DIVIDER; echo -e "${idsST[Reset]}" - nid=1 var=${NTYPE}_HOSTS[@] for nip in "${!var}"; do if [[ ${RUN_NODE_IP} != *"${nip}"* ]]; then echo -e " ${idsST[Bold]}${idsCL[LightCyan]}${NM_HOSTNAMES[${nip}]}[${nip}]${idsST[Reset]}${idsCL[Default]}" + DIVIDER . lightCyan 40 echo -e "\n${idsCL[LightCyan]}Copying Public SSH Key ...${idsCL[Default]}" ssh-copy-id root@${nip} echo -e "\n${idsCL[LightCyan]}Verifying NodeMgmt ...${idsCL[Default]}" - NODEUPDATE "${nip}" "${2}" "${NMCMD}" - - + NODEUPDATE ${nip} verify "${NMCMD}" echo - nid=`expr $nid + 1` fi done echo @@ -850,6 +847,7 @@ GUI(){ NODEUPDATES ${2} ${3} fi ;; + setupssh) SETUPSSH ${2} ${3} ${4} ${5} ${6};; update-dyndns) UPDATE_DYNDNS ${2} ${3} ${4} ${5} ${6};; backup) BACKUP;; downlist)