From 82222954e0975d5d6b1da8a2fb41daac78e9f266 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Tue, 8 Nov 2022 19:13:54 -0600
Subject: [PATCH] Update nodemgmt-scripts.sh

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

diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index 26776c52..05c138d1 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -1944,6 +1944,10 @@ VCENTER-SSL(){
 	VCUSER="administrator@scity.vs"
 	CURRENTLIVE=/etc/vmware-rhttpproxy/ssl/rui.crt
 	
+	CERT=/root/.acme.sh/$VCHOSTNAME/$VCHOSTNAME.cer
+	KEY=/root/.acme.sh/$VCHOSTNAME/$VCHOSTNAME.key
+	CHAIN=/root/.acme.sh/$VCHOSTNAME/fullchain.cer
+	
 	echo -en "${idsCL[LightCyan]}Checking days left on vCenter cert... ${idsCL[Default]}"
 	VCCERTDAYS=$(${FOLDER}/ssl-cert-check/ssl-cert-check -p 443 -s ${VCHOSTNAME} -N)
 	VCCERTDAYS=${VCCERTDAYS#*=}
@@ -1960,8 +1964,8 @@ VCENTER-SSL(){
 		echo 
 	fi
 	
-	LIVEMD5=$(md5sum $CURRENTLIVE | cut -d\  -f1)
-	CURRENTMD5=$(md5sum $CERT | cut -d\  -f1)
+	LIVEMD5=$(ssh root@$VCHOSTNAME "md5sum $CURRENTLIVE | cut -d\  -f1")
+	CURRENTMD5=$(md5sum $CERTDIR/cert.pem | cut -d\  -f1)
 	if [ "$LIVEMD5" == "$CURRENTMD5" ]; then
 		echo -e "${idsCL[Yellow]}Certificates remains the same, no newer certificates exist${idsCL[Default]}"
 		echo
@@ -1972,16 +1976,11 @@ VCENTER-SSL(){
 	echo -e "${idsCL[LightCyan]}This process make take up to 10mins${idsCL[Default]}"
 	echo
 	
-	
 	# eval $(awk '{ print "export " $1 }' /etc/sysconfig/vmware-environment)
 
-	CERT=/root/.acme.sh/$VCHOSTNAME/$VCHOSTNAME.cer
-	KEY=/root/.acme.sh/$VCHOSTNAME/$VCHOSTNAME.key
-	CHAIN=/root/.acme.sh/$VCHOSTNAME/fullchain.cer
-
-	scp /opt/nginx-proxy/ssl/$VCHOSTNAME/cert.pem root@${VCHOSTNAME}:$CERT
-	scp /opt/nginx-proxy/ssl/$VCHOSTNAME/privkey.pem root@${VCHOSTNAME}:$KEY
-	scp /opt/nginx-proxy/ssl/$VCHOSTNAME/fullchain.pem root@${VCHOSTNAME}:$CHAIN
+	scp $BASECERTDIR/$VCHOSTNAME/cert.pem root@${VCHOSTNAME}:$CERT
+	scp $BASECERTDIR/$VCHOSTNAME/privkey.pem root@${VCHOSTNAME}:$KEY
+	scp $BASECERTDIR/$VCHOSTNAME/fullchain.pem root@${VCHOSTNAME}:$CHAIN
 	
 	ssh root@$VCHOSTNAME "(printf '1\n%s\n' '$VCUSER'; sleep 1; printf '%s\n' '$(pass iDSVC)'; sleep 1; printf '2\n'; sleep 1; printf '%s\n%s\n%s\ny\n\n' '$CERT' '$KEY' '$CHAIN') | setsid /usr/lib/vmware-vmca/bin/certificate-manager"