diff --git a/defaults.inc b/defaults.inc index 77188781..0fe2611b 100755 --- a/defaults.inc +++ b/defaults.inc @@ -58,7 +58,17 @@ REPL_DESC['www']='Webserver Files' REPL_DESC['git']='Gitea System' REPL_DESC['gitssh']='Gitea SSH Keys' - +GET-CHECKCERT-DOMAINS(){ + declare -A CHECKCERT_DOMAINS + IFS=$'\n' + for LINE in `egrep -v '(^#|^$)' ${FOLDER}/ssl-cert-check/ssldomains`; do + HOST=${LINE%% *} + PORT=${LINE#* } + IFS=" " + CHECKCERT_DOMAINS[${HOST}]=${PORT} + done + unset IFS +} DISP_HEADER(){ declare -i cw; declare -i spc1; declare -i c diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index d28b1a82..4b53b4e9 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -579,6 +579,7 @@ NIGHTLYRENEW(){ LISTCERTS(){ declare -i cw; declare -i spc1; declare -i c + GET-CHECKCERT-DOMAINS if [ ! -z ${LOCAL_SERVICES+x} ]; then NCMD="ssh root@${PRIMARYHOST}" ${NCMD} rm -f /tmp/ssllist @@ -617,6 +618,11 @@ LISTCERTS(){ else date="${idsCL[Green]}$(date -d @${CERTEXPIRE} '+%m-%d-%Y')${idsCL[Default]}" fi + if [ "${GET-CHECKCERT-DOMAINS[${SUBJECT}]}" = "" ]; then + SUBJECT_DISP=${SUBJECT} + else + SUBJECT_DISP="${idsCL[Green]}${SUBJECT}${idsCL[Cyan]}" + fi if [ ${#SUBJECT_NAMES[@]} -lt 4 ]; then echo -e "${idsCL[Cyan]}${SUBJECT}${spc}${date} ${idsCL[Cyan]}${SUBJECTNAMES}${idsCL[Default]}" elif [ ${#SUBJECT_NAMES[@]} -lt 7 ]; then