From 0cab9f0cae0ff3e51ade4235d4567febe3aa0f6b Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Fri, 29 Dec 2023 23:00:21 -0600 Subject: [PATCH] update --- defaults.inc | 2 +- nodemgmt-scripts.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/defaults.inc b/defaults.inc index 435e2441..a071d3b1 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ #!/usr/bin/env bash -VERS='5.1.45-12292023' +VERS='5.1.46-12292023' 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 ' diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index f1d27d1c..01602cd5 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -368,7 +368,7 @@ NODEUPDATE(){ [ ${noup} -eq 0 ] && echo -en " ~ ${idsCL[LightCyan]}NodeMGMT${idsCL[Default]} : " if ! ${NCMD} command -v nodemgmt > /dev/null; then ${NCMD} "bash <(curl -sL https://go.scity.us/install-nodemgmt)" >/dev/null 2>&1 - ${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 + ${NMCMD} rsync -az ${NM_FOLDER}/conf/*.inc ${NM_FOLDER}/conf/*.conf root@${nip}:${NM_FOLDER}/conf/ & >/dev/null 2>&1 [ "${NM_GITPASS}" != "" ] && [ "${NM_GITUSER}" == "voltron" ] && ${NMCMD} "bash <(curl -sL https://go.scity.us/add-linux-pass)" >/dev/null 2>&1 echo -e "${idsCL[Green]}Installed & Synced${idsCL[Default]}" elif [ ${noup} -eq 1 ]; then @@ -378,7 +378,7 @@ NODEUPDATE(){ fi else 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 + ${NMCMD} rsync -az ${NM_FOLDER}/conf/*.inc ${NM_FOLDER}/conf/*.conf root@${nip}:${NM_FOLDER}/conf/ & >/dev/null 2>&1 echo -e "${idsCL[Green]}Files Synced${idsCL[Default]}" fi else