voltron/NodeMgmt
1
1
Fork 0
Code Issues Pull Requests Releases 1 Activity

update

Browse Source
This commit is contained in:
David Schroeder
2025-07-05 15:55:09 -05:00
parent ad647dea4b
commit 930ee2e6ff
2 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
defaults.inc
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
VERS='5.5.33-06302025' VERS='5.6.1a-07052025'
NM_BETA=false 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 ' 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 '

13
inc/certs.inc
View File

@@ -663,6 +663,9 @@ COPYCERTS(){
local COPYCERT=${1} local COPYCERT=${1}
local CERTFOLDER=${2} local CERTFOLDER=${2}
if [ -f ${NM_FOLDER}/conf/copycerts.sh.inc ]; then
source ${NM_FOLDER}/conf/copycerts.sh.inc
if [ "${COPYCERT}" ] && [ "${CERTFOLDER}" ]; then if [ "${COPYCERT}" ] && [ "${CERTFOLDER}" ]; then
arr COPYCERTS arr COPYCERTS
@@ -672,18 +675,17 @@ COPYCERTS(){
IFS=,; var=(${CERTFOLDER}); unset IFS IFS=,; var=(${CERTFOLDER}); unset IFS
for value in "${var[@]}"; do arr_insert CERTFOLDERS ${value}; done for value in "${var[@]}"; do arr_insert CERTFOLDERS ${value}; done
i=0 i=0; RUN_POST_COMMANDS=false
for CERTSITE in "${COPYCERTS[@]}"; do for CERTSITE in "${COPYCERTS[@]}"; do
c=0; spc=''; until [ $c = $(expr 35 - ${#CERTSITE}) ]; do spc="${spc} "; c=$(expr ${c} + 1); done c=0; spc=''; until [ $c = $(expr 35 - ${#CERTSITE}) ]; do spc="${spc} "; c=$(expr ${c} + 1); done
echo -en "${idsCL[LightCyan]}Updating ${idsCL[Green]}${CERTSITE}${spc}${idsCL[LightCyan]}: " echo -en "${idsCL[LightCyan]}Updating ${idsCL[Green]}${CERTSITE}${spc}${idsCL[LightCyan]}: "
COPYTO=${CERTFOLDERS[${i}]} COPYTO=${CERTFOLDERS[${i}]}
NCF=false
scp le@keepalived.scity.us:/etc/letsencrypt/live/${CERTSITE}/privkey.pem ${COPYTO}/privkey.pem >/dev/null 2>&1 scp le@keepalived.scity.us:/etc/letsencrypt/live/${CERTSITE}/privkey.pem ${COPYTO}/privkey.pem >/dev/null 2>&1
if ! /usr/bin/md5sum -c ${COPYTO}/privkey.pem.md5 >/dev/null 2>&1 || [ "${3^^}" == "FORCE" ]; then if ! /usr/bin/md5sum -c ${COPYTO}/privkey.pem.md5 >/dev/null 2>&1 || [ "${3^^}" == "FORCE" ]; then
scp le@keepalived.scity.us:/etc/letsencrypt/live/${CERTSITE}/* ${COPYTO}/ >/dev/null 2>&1 scp le@keepalived.scity.us:/etc/letsencrypt/live/${CERTSITE}/* ${COPYTO}/ >/dev/null 2>&1
rm -f ${COPYTO}/privkey.pem.md5 >/dev/null 2>&1 rm -f ${COPYTO}/privkey.pem.md5 >/dev/null 2>&1
md5sum ${COPYTO}/privkey.pem > ${COPYTO}/privkey.pem.md5 >/dev/null 2>&1 md5sum ${COPYTO}/privkey.pem > ${COPYTO}/privkey.pem.md5 >/dev/null 2>&1
NCF=true RUN_POST_COMMANDS=true
echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}" echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}"
else else
echo -e "${idsCL[LightCyan]}No update needed${idsCL[Default]}" echo -e "${idsCL[LightCyan]}No update needed${idsCL[Default]}"
@@ -691,11 +693,10 @@ COPYCERTS(){
((i++)) ((i++))
done done
echo echo
# [ ${NCF} = true ] && SERVICE_MGMT nginx reload [ ${RUN_POST_COMMANDS} = true ] && COPYCERTS_POST_COMMANDS && echo
echo
fi fi
fi
} }