This commit is contained in:
2019-02-11 12:40:49 -06:00
parent 8e8cfe9429
commit 27c3abb7c2
2 changed files with 17 additions and 1 deletions

View File

@@ -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

View File

@@ -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