From 96b1c86713c966512b2053a72b4da881f0cc6377 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Mon, 4 Feb 2019 22:39:04 -0600
Subject: [PATCH] Update nodemgmt-scripts.sh

---
 nodemgmt-scripts.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index 921df2a6..a435edea 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -85,13 +85,13 @@ CERTRENEW(){
 
 LISTCERTS(){
 	#DIVIDER true
-	for d in /etc/letsencrypt/live/*/ ; do
-		SUBJECT=$(openssl x509 -in ${d}/cert.pem -noout -subject)
-		SUBJECTNAMES=$(openssl x509 -in ${d}/cert.pem -noout -text|grep -oP '(?<=DNS:|IP Address:)[^,]+'|sort -uV)
+	for certdir in /etc/letsencrypt/live/*/ ; do
+		#SUBJECT=$(openssl x509 -in ${certdir}/cert.pem -noout -subject)
+		SUBJECT=$(openssl x509 -in ${certdir}/cert.pem -noout -subject|grep -oP '(?<=DNS:|IP Address:)[^,]+'|sort -uV)
+		SUBJECTNAMES=$(openssl x509 -in ${certdir}/cert.pem -noout -text|grep -oP '(?<=CN = )[^,]+'|sort -uV)
 		IFS=':'; SUBJECTNAMES=(${SUBJECTNAMES//$'\n'/:}); unset IFS
-		DAYS=14
-		CERTEXPIRE=$(date -d "$(: | openssl x509 -in ${d}/cert.pem -text | grep 'Not After' |awk '{print $4,$5,$7}')" '+%s'); 
-		DUEIN=$(($(date +%s) + (86400*$DAYS)));
+		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)));
 		if [ $DUEIN -gt $CERTEXPIRE ]; then CERTEXPIRED=true; else CERTEXPIRED=false; fi
 		
 		echo $d