From 022d98e6701ff50711d80c1f7a2522f460fe5e9c Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 5 Jul 2025 20:09:18 -0500 Subject: [PATCH] update --- defaults.inc | 2 +- install.sh | 1 + nodemgmt-scripts.sh | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/defaults.inc b/defaults.inc index 7928c913..a9e9321b 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='5.6.1g-07052025' +VERS='5.6.1m-07052025' NM_BETA=false noheader=' test 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 offsite-staticroute-fix ' diff --git a/install.sh b/install.sh index 76d8067c..a85efa3b 100755 --- a/install.sh +++ b/install.sh @@ -11,6 +11,7 @@ $APTFUNC -y install wget curl git set -eu git clone https://git.schroedercity.com/voltron/NodeMgmt.git /opt/idssys/nodemgmt ln -s /opt/idssys/nodemgmt/run.sh /usr/local/bin/nodemgmt +ln -s /opt/idssys/nodemgmt/run.sh /usr/local/bin/nmg /bin/chmod +x /opt/idssys/nodemgmt/*.sh if [ ! -f /etc/rsyslog.d/01-ignore-session-messages.conf ]; then cp /opt/idssys/nodemgmt/conf/rsyslog/01-ignore-session-messages.conf /etc/rsyslog.d/ diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index eb226a67..e7069eeb 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -420,7 +420,7 @@ NODEUPDATE(){ fi if ! ${NCMD} command -v nodemgmt > /dev/null 2>&1; then ${NCMD} "bash <(curl -sL https://go.scity.us/install-nodemgmt)" &1 - ${NMCMD} rsync -az ${NM_FOLDER}/conf/*.inc ${NM_FOLDER}/conf/*.conf root@${nip}:${NM_FOLDER}/conf/ &1 + ${NMCMD} rsync -az ${NM_FOLDER}/conf/*.inc --exclude ${NM_FOLDER}/conf/copycerts.sh.inc ${NM_FOLDER}/conf/*.conf root@${nip}:${NM_FOLDER}/conf/ &1 ${NMCMD} rsync -az ${NM_FOLDER}/conf/powerwall ${NM_FOLDER}/conf/*.conf root@${nip}:${NM_FOLDER}/conf/ &1 sleep 2s source /opt/idssys/nodemgmt/conf/settings.conf @@ -434,7 +434,7 @@ NODEUPDATE(){ ${NCMD} "nodemgmt update q" >> ${tmpfile}.running fi else - ${NMCMD} rsync -az ${NM_FOLDER}/conf/*.inc ${NM_FOLDER}/conf/*.conf root@${nip}:${NM_FOLDER}/conf/ & &1 + ${NMCMD} rsync -az --exclude ${NM_FOLDER}/conf/copycerts.sh.inc ${NM_FOLDER}/conf/*.inc ${NM_FOLDER}/conf/*.conf root@${nip}:${NM_FOLDER}/conf/ & &1 ${NMCMD} rsync -az ${NM_FOLDER}/conf/powerwall ${NM_FOLDER}/conf/*.conf root@${nip}:${NM_FOLDER}/conf/ &1 echo -e "${idsCL[Green]}Files Synced${idsCL[Default]}" >> ${tmpfile}.running fi