From b6b63f9c57814c4ea9caf2aadbace38fa0a84d5a Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Mon, 11 Feb 2019 18:46:07 -0600
Subject: [PATCH] Update nodemgmt-scripts.sh

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

diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index 7a0e191f..c43c963e 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -655,7 +655,7 @@ LISTCERTS(){
 	echo 
 	echo -e "${idsCL[LightGreen]}Current Certificates on Node...${idsCL[Default]}"
 	DIVIDER false yellow 100
-	echo -e "Subject Name                      Expires       Alternate Subject Names"
+	echo -e "Subject Name                Monitored   Expires       Alternate Subject Names"
 	DIVIDER false yellow 100
 	
 	for certdir in $(</tmp/ssllist); do
@@ -673,6 +673,7 @@ LISTCERTS(){
 		
 		c=0; cw=30; spc=''
 		spc1=${cw}-${#SUBJECT}
+		until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
 		if [ $DUEIN -gt $CERTEXPIRE ]; then
 			date="${idsST[Bold]}${idsCL[Red]}$(date -d @${CERTEXPIRE} '+%m-%d-%Y')${idsST[Reset]}${idsCL[Default]}"
 		else
@@ -680,18 +681,20 @@ LISTCERTS(){
 		fi
 		
 		if [ "${CHECKCERT_DOMAINS[${SUBJECT}]}" = "" ]; then
-			SUBJECT_DISP="${SUBJECT}"
-			until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
+			monitored='No '
+			# SUBJECT_DISP="${SUBJECT}"
+			# until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
 		else
-			SUBJECT_DISP="${idsBG[Cyan]}${idsCL[White]}${SUBJECT}${idsBG[Default]}${idsCL[Cyan]}"
-			spc="${idsBG[Cyan]}"
-			until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
-			spc="${spc}${idsBG[Default]}${idsCL[Cyan]}"
+			monitored='Yes'
+			# SUBJECT_DISP="${idsBG[Cyan]}${idsCL[White]}${SUBJECT}${idsBG[Default]}${idsCL[Cyan]}"
+			# spc="${idsBG[Cyan]}"
+			# until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
+			# spc="${spc}${idsBG[Default]}${idsCL[Cyan]}"
 		fi
 		if [ ${#SUBJECT_NAMES[@]} -lt 4 ]; then
-			echo -e "${idsCL[Cyan]}${SUBJECT_DISP}${spc}    ${date}    ${idsCL[Cyan]}${SUBJECTNAMES}${idsCL[Default]}"
+			echo -e "${idsCL[Cyan]}${SUBJECT}${spc}${monitored}    ${date}    ${idsCL[Cyan]}${SUBJECTNAMES}${idsCL[Default]}"
 		elif [ ${#SUBJECT_NAMES[@]} -lt 7 ]; then
-			echo -e "${idsCL[Cyan]}${SUBJECT_DISP}${spc}    ${date}    ${idsCL[Cyan]}${SUBJECT_NAMES[0]}, ${SUBJECT_NAMES[1]}, ${SUBJECT_NAMES[2]}${idsCL[Default]}"
+			echo -e "${idsCL[Cyan]}${SUBJECT}${spc}${monitored}    ${date}    ${idsCL[Cyan]}${SUBJECT_NAMES[0]}, ${SUBJECT_NAMES[1]}, ${SUBJECT_NAMES[2]}${idsCL[Default]}"
 			c=0; spc=''; until [ $c = ${cw} ]; do spc="${spc} "; c=`expr $c + 1`; done
 			echo -e "${idsCL[Cyan]}${spc}                  ${idsCL[Cyan]}${SUBJECT_NAMES[3]}, ${SUBJECT_NAMES[4]}, ${SUBJECT_NAMES[5]}${idsCL[Default]}"