From 09d9ff2da3d6e3b16c4e379b6b841c62c101585d Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Thu, 23 Nov 2023 23:24:18 -0600 Subject: [PATCH] update --- defaults.inc | 2 +- inc/certs.inc | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/defaults.inc b/defaults.inc index 2b30972b..4fd3d076 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ #!/usr/bin/env bash -VERS='4.15.20-11232023' +VERS='4.15.21-11232023' noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update log ' CERT_DAEMON='/snap/bin/certbot' diff --git a/inc/certs.inc b/inc/certs.inc index dcb71e28..1aff3def 100755 --- a/inc/certs.inc +++ b/inc/certs.inc @@ -662,12 +662,16 @@ export PDNS_Ttl=60 if ssh -q root@${NM_VC_HOSTNAME} [ ! -d ${NM_VC_ACMEFOLDER} ]; then echo -e "${idsCL[Yellow]}Installing acme.sh scripts onto vCenter ... ${idsCL[Default]}\n" ssh -q root@${NM_VC_HOSTNAME} "wget -O - https://get.acme.sh | sh" + else + echo -e "${idsCL[Green]}Verified acme.sh scripts are installed on vCenter, checking for updates ... ${idsCL[Default]}\n" + ssh -q root@${NM_VC_HOSTNAME} "${NM_VC_ACMEFOLDER}/${NM_VC_ACMESCRIPT} --upgrade" + fi + + if [ ! -d ${NM_VC_ACMEFOLDER}/${NM_VC_HOSTNAME} ];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' --issue --dns dns_pdns -d ${NM_VC_HOSTNAME}" >> /tmp/vcenter-update-ssl.sh else - echo -e "${idsCL[Green]}Verified acme.sh scripts are installed on vCenter, checking for updates ... ${idsCL[Default]}\n" - ssh -q root@${NM_VC_HOSTNAME} "${NM_VC_ACMEFOLDER}/${NM_VC_ACMESCRIPT} --upgrade" echo -e "\n${idsCL[LightGreen]}Renewing certificate ...${idsCL[Default]}\n" if [ "${1}" == "force" ]; then echo "${NM_VC_ACMEFOLDER}/${NM_VC_ACMESCRIPT} --renew-all --force" >> /tmp/vcenter-update-ssl.sh