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