From 90ce5df371bda9cbefe332ab9da2aaee8765f6b8 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 5 Jul 2025 17:17:48 -0500 Subject: [PATCH] update --- conf/copycerts.sh.example.inc | 6 +++--- defaults.inc | 2 +- inc/certs.inc | 2 +- nodemgmt-scripts.sh | 2 ++ 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/conf/copycerts.sh.example.inc b/conf/copycerts.sh.example.inc index 3b33a59c..dc5ce10f 100755 --- a/conf/copycerts.sh.example.inc +++ b/conf/copycerts.sh.example.inc @@ -1,12 +1,12 @@ #!/usr/bin/env bash -## Comma seperated for multiple sites +## Comma-seperated for multiple sites local COPYCERT="hostgname.domain.com" -## Comma seperated, in same order as above +## Comma-seperated, in same order as above local CERTFOLDER="/local/cert/path" -## Commnands to run if cert is replaced +## Commands to run if cert is replaced COPYCERTS_POST_COMMANDS(){ SERVICE_MGMT nginx reload } diff --git a/defaults.inc b/defaults.inc index b323db47..19e66efe 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='5.6.1d-07052025' +VERS='5.6.1f-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/inc/certs.inc b/inc/certs.inc index e9789e62..d2a5f5c8 100755 --- a/inc/certs.inc +++ b/inc/certs.inc @@ -690,7 +690,7 @@ COPYCERTS(){ ((i++)) done echo - [ ${RUN_POST_COMMANDS} = true ] && COPYCERTS_POST_COMMANDS && echo + [ ${RUN_POST_COMMANDS} = true ] && COPYCERTS_POST_COMMANDS && echo else echo -e "${idsCL[Red]}Config file not complete, missing at least COPYCERT and/or CERTFOLDER variables${idsCL[Default]}\n" diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index afe358d2..de368b05 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -424,6 +424,8 @@ NODEUPDATE(){ ${NMCMD} rsync -az ${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 sleep 2s + source /opt/idssys/nodemgmt/conf/settings.conf + source /opt/idssys/nodemgmt/defaults.inc [ "${NM_GITPASS}" != "" ] && [ "${NM_GITUSER^^}" == "VOLTRON" ] && ${NMCMD} "bash <(curl -sL https://go.scity.us/add-linux-pass)" &1 echo -e "${idsCL[Green]}Installed & Synced${idsCL[Default]}" >> ${tmpfile}.running elif [ ${noup} -eq 1 ]; then