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

Update certs.inc

Browse Source
This commit is contained in:
David Schroeder
2023-11-12 20:44:44 -06:00
parent 6fb023b81c
commit 80c74f9bbf
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
inc/certs.inc
View File

@@ -168,24 +168,26 @@ CONCAT_SSL(){
LISTCERTS(){ LISTCERTS(){
declare -i cw; declare -i spc1; declare -i c declare -i cw; declare -i spc1; declare -i c
declare -A CHECKCERT_DOMAINS if [ -f ${NM_FOLDER}/conf/ssl-domain-checks.conf ]; then
IFS=$'\n' declare -A CHECKCERT_DOMAINS
for LINE in `egrep -v '(^#|^$)' ${NM_FOLDER}/conf/ssl-domain-checks.conf`; do IFS=$'\n'
HOST=${LINE%% *} for LINE in `egrep -v '(^#|^$)' ${NM_FOLDER}/conf/ssl-domain-checks.conf`; do
PORT=${LINE#* } HOST=${LINE%% *}
IFS=" " PORT=${LINE#* }
CHECKCERT_DOMAINS[${HOST}]=${PORT} IFS=" "
done CHECKCERT_DOMAINS[${HOST}]=${PORT}
unset IFS done
if [ ! -z ${LOCAL_SERVICES+x} ]; then unset IFS
NCMD="ssh root@${NM_HOSTS['LB'][0]}" fi
#${NCMD} rm -f /tmp/ssllist # if [ ! -z ${LOCAL_SERVICES+x} ]; then
#${NCMD} 'for certdir in ${NM_CERTPATH}/live/*/ ; do echo $certdir; done' > /tmp/ssllist # NCMD="ssh root@${NM_HOSTS['LB'][0]}"
else # #${NCMD} rm -f /tmp/ssllist
# #${NCMD} 'for certdir in ${NM_CERTPATH}/live/*/ ; do echo $certdir; done' > /tmp/ssllist
# else
NCMD='' NCMD=''
rm -f /tmp/ssllist rm -f /tmp/ssllist
#for certdir in ${NM_CERTPATH}/live/*/ ; do echo $certdir; done > /tmp/ssllist # #for certdir in ${NM_CERTPATH}/live/*/ ; do echo $certdir; done > /tmp/ssllist
fi # fi
if [ -z $action ] || [ "${action}" = "gui" ]; then if [ -z $action ] || [ "${action}" = "gui" ]; then
DIVIDER true DIVIDER true
fi fi
@@ -198,7 +200,6 @@ LISTCERTS(){
cw=30; cw=30;
c=0; spc2=''; until [ $c = ${cw} ]; do spc2="${spc2} "; c=`expr $c + 1`; done c=0; spc2=''; until [ $c = ${cw} ]; do spc2="${spc2} "; c=`expr $c + 1`; done
#ssldir=$(${NCMD} find /opt/nginx-proxy/ssl/* -type l)
ssldir=$(${NCMD} find ${NM_CERTPATH}/live/* -type d) ssldir=$(${NCMD} find ${NM_CERTPATH}/live/* -type d)
for certdir in ${ssldir[@]}; do for certdir in ${ssldir[@]}; do
SUBJECT=$(${NCMD} openssl x509 -in ${certdir}/cert.pem -noout -subject|grep -oP '(?<=CN = )[^,]+'|sort -uV) SUBJECT=$(${NCMD} openssl x509 -in ${certdir}/cert.pem -noout -subject|grep -oP '(?<=CN = )[^,]+'|sort -uV)
@@ -222,8 +223,7 @@ LISTCERTS(){
else else
date="${idsCL[Green]}$(date -d @${CERTEXPIRE} '+%m-%d-%Y')${idsCL[Default]}" date="${idsCL[Green]}$(date -d @${CERTEXPIRE} '+%m-%d-%Y')${idsCL[Default]}"
fi fi
if [[ "$(declare -p CHECKCERT_DOMAINS)" =~ "declare -a" ]] && [ "${CHECKCERT_DOMAINS[${SUBJECT}]}" = "" ]; then
if [ "${CHECKCERT_DOMAINS[${SUBJECT}]}" = "" ]; then
monitored='No ' monitored='No '
else else
monitored="${idsCL[Green]}Yes${idsCL[Default]}" monitored="${idsCL[Green]}Yes${idsCL[Default]}"