From 5092c1894be7ebe44c31ef42ce18a24af879d26c Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 29 Jan 2023 09:32:43 -0600 Subject: [PATCH] Update nodemgmt-scripts.sh --- nodemgmt-scripts.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 7927052a..ccd7e900 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -1004,7 +1004,8 @@ LISTCERTS_NPM(){ } COPYCERTS_NPM(){ ssldir='/opt/nginx-proxy/ssl' - ssldirs=$(find /opt/nginx-proxy/letsencrypt/live -type d) + ssls=$(find /opt/nginx-proxy/letsencrypt/live -type d) + ssldirs=$(find ${ssldir} -type l) if [ "${1}" = "reset" ]; then echo "Resetting ... Deleting all SSL symlink folders" @@ -1012,8 +1013,8 @@ COPYCERTS_NPM(){ rm ${certdir} done else - olddirs=$(find $ssldir -type l ! -exec test -e {} \; -print) - for od in ${olddirs[@]}; do + baddirs=$(find $ssldir -type l ! -exec test -e {} \; -print) + for od in ${baddirs[@]}; do echo "Removing old folder ... ${od}" rm -f ${od} done @@ -1023,7 +1024,7 @@ COPYCERTS_NPM(){ DIVIDER true fi - for certdir in ${ssldirs[@]}; do + for certdir in ${ssls[@]}; do SUBJECT=$(openssl x509 -in ${certdir}/cert.pem -noout -subject|grep -oP '(?<=CN = )[^,]+'|sort -uV) if [ ! -L ${ssldir}/${SUBJECT} ]; then echo "${SUBJECT} ... creating"