From 79d36ad9f84d5acd21bfd18f63bfac2013eef3ff Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Fri, 28 Jun 2024 17:55:35 -0500
Subject: [PATCH] Update certs.inc

---
 inc/certs.inc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/inc/certs.inc b/inc/certs.inc
index a3b63a0b..e68716f2 100755
--- a/inc/certs.inc
+++ b/inc/certs.inc
@@ -647,9 +647,9 @@ VCENTER-SSL(){
 	if [ "${NM_VC_HOSTNAME}" != "" ] && [ "${NM_VC_USER}" != "" ] && [ "${NM_VC_PASS}" != "" ] && [ "${NM_PDNS_APIKEY}" != "" ]; then
 		VCSERVER="https://${NM_VC_HOSTNAME}"
 	
-		VC_CERT="${NM_VC_ACMEFOLDER}/${NM_VC_HOSTNAME}/${NM_VC_HOSTNAME}.cer"
-		VC_KEY="${NM_VC_ACMEFOLDER}/${NM_VC_HOSTNAME}/${NM_VC_HOSTNAME}.key"
-		VC_CHAIN="${NM_VC_ACMEFOLDER}/${NM_VC_HOSTNAME}/fullchain.cer"
+		VC_CERT="${NM_VC_ACMEFOLDER}/${NM_VC_HOSTNAME}_ecc/${NM_VC_HOSTNAME}.cer"
+		VC_KEY="${NM_VC_ACMEFOLDER}/${NM_VC_HOSTNAME}_ecc/${NM_VC_HOSTNAME}.key"
+		VC_CHAIN="${NM_VC_ACMEFOLDER}/${NM_VC_HOSTNAME}_ecc/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_VC_HOSTNAME} -N)
@@ -688,7 +688,7 @@ export PDNS_Ttl=60
 			ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_VC_HOSTNAME} "${NM_VC_ACMEFOLDER}/${NM_VC_ACMESCRIPT} --upgrade"
 		fi
 		
-		if [ ! -d ${NM_VC_ACMEFOLDER}/${NM_VC_HOSTNAME} ];then
+		if [ ! -d ${NM_VC_ACMEFOLDER}/${NM_VC_HOSTNAME}_ecc ];then
 			echo -e "\n${idsCL[LightGreen]}Requesting new certificate ...${idsCL[Default]}\n"
 			echo "export PDNS_ServerId='localhost'" >> /tmp/vcenter-update-ssl.sh
 			echo "${NM_VC_ACMEFOLDER}/${NM_VC_ACMESCRIPT} --server letsencrypt -k 2048 --preferred-chain 'ISRG Root X1' --keylength ec-256 --issue --dns dns_pdns -d ${NM_VC_HOSTNAME}" >> /tmp/vcenter-update-ssl.sh
@@ -706,10 +706,10 @@ export PDNS_Ttl=60
 		scp -q /tmp/vcenter-update-ssl.sh root@${NM_VC_HOSTNAME}:/tmp/vcenter-update-ssl.sh
 		ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_VC_HOSTNAME} "bash /tmp/vcenter-update-ssl.sh"
 		
-		if ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_VC_HOSTNAME} [ ! -f ${NM_VC_ACMEFOLDER}/${NM_VC_HOSTNAME}/${NM_VC_HOSTNAME}.cer ]; then
+		if ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_VC_HOSTNAME} [ ! -f ${NM_VC_ACMEFOLDER}/${NM_VC_HOSTNAME}_ecc/${NM_VC_HOSTNAME}.cer ]; then
 			echo -e "${idsCL[LightYellow]}No certificate was created${idsCL[Default]}\n"
 			exit 0
-		elif ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_VC_HOSTNAME} [ $(expr `date +%s` - $(stat -c %Y ${NM_VC_ACMEFOLDER}/${NM_VC_HOSTNAME}/${NM_VC_HOSTNAME}.cer)) -ge 600 ]; then
+		elif ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_VC_HOSTNAME} [ $(expr `date +%s` - $(stat -c %Y ${NM_VC_ACMEFOLDER}/${NM_VC_HOSTNAME}_ecc/${NM_VC_HOSTNAME}.cer)) -ge 600 ]; then
 			echo -e "${idsCL[LightYellow]}The certificate was unable to be updated${idsCL[Default]}\n"
 			exit 0
 		else