From 6837f6ceef92de173957fae8f6344f9d5a34284a Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Wed, 6 Feb 2019 12:20:33 -0600 Subject: [PATCH] Update nodemgmt-scripts.sh --- nodemgmt-scripts.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index b9dc9de0..23845151 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -119,7 +119,7 @@ NIGHTLYRENEW(){ } LISTCERTS(){ - #DIVIDER true + DIVIDER true for certdir in /etc/letsencrypt/live/*/ ; do SUBJECT=$(openssl x509 -in ${certdir}/cert.pem -noout -subject|grep -oP '(?<=CN = )[^,]+'|sort -uV) SUBJECTNAMES=$(openssl x509 -in ${certdir}/cert.pem -noout -text|grep -oP '(?<=DNS:|IP Address:)[^,]+'|sort -uV) @@ -130,7 +130,7 @@ LISTCERTS(){ CERTEXPIRE=$(date -d "$(: | openssl x509 -in ${certdir}/cert.pem -text | grep 'Not After' |awk '{print $4,$5,$7}')" '+%s'); DAYS=14; DUEIN=$(($(date +%s) + (86400*$DAYS))); - DIVIDER true + #DIVIDER true #echo -e "Certificate Subject: ${idsST[Bold]}${idsBG[Blue]}${SUBJECT}${idsST[Reset]}${idsBG[Default]}" #if [ "$SUBJECTNAMES" != "" ]; then # echo -e "Alternate Subject(s): ${idsCL[Cyan]}${SUBJECTNAMES}${idsCL[Default]}" @@ -157,10 +157,9 @@ LISTCERTS(){ else date="${idsCL[Green]}$(date -d @${CERTEXPIRE} '+%m-%d-%Y')${idsCL[Default]}" fi - echo -e "${idsCL[Cyan]}${SUBJECT}${spc}${date} ${idsCL[Cyan]}${SUBJECTNAMES}${idsCL[Default]}" - echo - + echo -e "${idsCL[Cyan]}${SUBJECT}${spc}${date} ${idsCL[Cyan]}${SUBJECTNAMES}${idsCL[Default]}" done + echo if [ -z $action ] || [ "${action}" = "gui" ]; then DIVIDER true ENTER2CONTINUE