diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 2793f797..1c877a0d 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -584,14 +584,14 @@ LISTCERTS(){ echo -e "Subject Name Expires Alternate Subjects" DIVIDER 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) - SUBJECTNAMES=${SUBJECTNAMES//$'\n'/, } - SUBJECTNAMES=$(echo $SUBJECTNAMES | sed "s/${SUBJECT}, //g") - SUBJECTNAMES=$(echo $SUBJECTNAMES | sed "s/, ${SUBJECT}//g") - SUBJECTNAMES=$(echo $SUBJECTNAMES | sed "s/${SUBJECT}//g") - 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))); + # 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) + # SUBJECTNAMES=${SUBJECTNAMES//$'\n'/, } + # SUBJECTNAMES=$(echo $SUBJECTNAMES | sed "s/${SUBJECT}, //g") + # SUBJECTNAMES=$(echo $SUBJECTNAMES | sed "s/, ${SUBJECT}//g") + # SUBJECTNAMES=$(echo $SUBJECTNAMES | sed "s/${SUBJECT}//g") + # 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))); AWK=$(which awk) DATE=$(which date) @@ -601,11 +601,9 @@ LISTCERTS(){ CERTDATE=$(${OPENSSL} x509 -in ${certdir}/cert.pem -text -enddate -noout -inform pem | ${SED} 's/notAfter\=//') - COMMONNAME=$(${OPENSSL} x509 -in ${certdir}/cert.pem -text -subject -noout -inform pem | \ + SUBJECT=$(${OPENSSL} x509 -in ${certdir}/cert.pem -text -subject -noout -inform pem | \ ${SED} -e 's/.*CN=//' | \ ${SED} -e 's/\/.*//') - - SUBJECT=${COMMONNAME} declare -i cw; declare -i spc1; declare -i c