From e789ba15f34114d46cf0352ccff78856f78f067a Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Wed, 22 Nov 2023 18:26:50 -0600
Subject: [PATCH] Update nodemgmt-scripts.sh

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

diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index b755601d..c3f45607 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -396,14 +396,13 @@ NODEUPDATE() {
 }
 
 VCENTER-SSL(){
-	if [ "${NM_VCHOSTNAMExx}" != "" ] && [ "${NM_VCUSER}" != "" ] && [ "${NM_VCPASS}" != "" ]; then
+	if [ "${NM_VCHOSTNAME}" != "" ] && [ "${NM_VCUSER}" != "" ] && [ "${NM_VCPASS}" != "" ]; then
 		VCSERVER="https://${NM_VCHOSTNAME}"
-		CRED="administrator@scity.vs:$(pass iDSVC)"	
 		CURRENTLIVE=/etc/vmware-rhttpproxy/ssl/rui.crt
 	
-		CERT=/root/.acme.sh/${NM_VCHOSTNAME}/${NM_VCHOSTNAME}.cer
-		KEY=/root/.acme.sh/${NM_VCHOSTNAME}/${NM_VCHOSTNAME}.key
-		CHAIN=/root/.acme.sh/${NM_VCHOSTNAME}/fullchain.cer
+		VC_CERT=/root/.acme.sh/${NM_VCHOSTNAME}/${NM_VCHOSTNAME}.cer
+		VC_KEY=/root/.acme.sh/${NM_VCHOSTNAME}/${NM_VCHOSTNAME}.key
+		VC_CHAIN=/root/.acme.sh/${NM_VCHOSTNAME}/fullchain.cer
 	
 		echo -en "${idsCL[LightCyan]}Checking days left on vCenter cert... ${idsCL[Default]}"
 		VCCERTDAYS=$(${NM_FOLDER}/ssl-cert-check/ssl-cert-check -p 443 -s ${NM_VCHOSTNAME} -N)
@@ -437,20 +436,17 @@ VCENTER-SSL(){
 		# 	exit 0
 		# fi
 	
-		echo -e "${idsCL[Green]}Updating certificates on vCenter... ${idsCL[Default]}"
-		echo -e "${idsCL[LightCyan]}This process make take up to 10mins${idsCL[Default]}"
-		echo
+		# echo -e "${idsCL[Green]}Updating certificates on vCenter... ${idsCL[Default]}"
+		# echo -e "${idsCL[LightCyan]}This process make take up to 10mins${idsCL[Default]}"
+		# echo
 	
-		# ssh root@${NM_VCHOSTNAME} "(printf '1\n%s\n' '${NM_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"
+		# ssh root@${NM_VCHOSTNAME} "(printf '1\n%s\n' '${NM_VCUSER}'; sleep 1; printf '%s\n' '${NM_VCPASS}'; sleep 1; printf '2\n'; sleep 1; printf '%s\n%s\n%s\ny\n\n' '${VC_CERT}' '${VC_KEY}' '${VC_CHAIN}') | setsid /usr/lib/vmware-vmca/bin/certificate-manager"
 	
 	
-		echo
-		echo -e "${idsCL[Green]}The vCenter certifcate has been updated${idsCL[Default]}"
-		echo -e "${idsCL[LightCyan]}Don't forget to re-scan the vCenter connection in Veeam${idsCL[Default]}"
-		echo
+		echo -e "\n${idsCL[Green]}The vCenter certifcate has been updated${idsCL[Default]}"
+		echo -e "${idsCL[LightCyan]}Don't forget to re-scan the vCenter connection in Veeam${idsCL[Default]}\n"
 	else
 		echo -e "${idsCL[Yellow]}vCenter info not configured in 'defaults.local.inc'${idsCL[Default]}\n"
-		echo "HERE: ${NM_VCPASS}"
 	fi
 }
 ADD_LOGROTATE_CRONTAB(){