diff --git a/conf/defaults.local.example.inc b/conf/defaults.local.example.inc index 78f36a4f..a99ec0b3 100755 --- a/conf/defaults.local.example.inc +++ b/conf/defaults.local.example.inc @@ -4,13 +4,13 @@ NM_NODEMANAGER=192.168.1.5 # DEFINE VCENTER INFO TO APPLY SSL CERTS #----------------------------------------------------------------------------------------------------------------------------------------- -# NM_VC_HOSTNAME='vCenter FQDN or LAN IP' -# NM_VC_USER='administrator@vsphere.local' -# NM_VC_PASS='supersecret' +NM_VC_HOSTNAME='vCenter FQDN or LAN IP' +NM_VC_USER='administrator@vsphere.local' +NM_VC_PASS='supersecret' # DEFINE DYNAMIC DNS LOGIN INFO FOR POWER-DNS SERVERS FOR UPDATING RECORDS #----------------------------------------------------------------------------------------------------------------------------------------- -NM_PDNS_HOST="" # IF NOT DEFINED, USES SCITY DEFAULT PDNS SERVERS (wdns.scity.us) +# NM_PDNS_HOST="" NM_PDNS_USER="" NM_PDNS_PASS="" NM_PDNS_APIKEY="" diff --git a/inc/certs.inc b/inc/certs.inc index 20d9ae3b..670cf6e3 100755 --- a/inc/certs.inc +++ b/inc/certs.inc @@ -650,21 +650,23 @@ VCENTER-SSL(){ echo fi + ssh -q root@${NM_VC_HOSTNAME} 'sed -i "/PDNS_Token/d" /root/.acme.sh/account.conf' + ssh -q root@${NM_VC_HOSTNAME} 'sed -i "/PDNS_Url/d" /root/.acme.sh/account.conf' + echo '#!/usr/bin/env bash' >| /tmp/vcenter-update-ssl.sh - echo "export PDNS_Url='https://wdns.scity.us' + echo "export PDNS_Url='${NM_PDNS_URL}' export PDNS_Token='${NM_PDNS_APIKEY}' -# export PDNS_ServerId='localhost' -export PDNS_ServerId='scity.us' export PDNS_Ttl=60 " >> /tmp/vcenter-update-ssl.sh if ssh -q root@${NM_VC_HOSTNAME} [ ! -d ${NM_VC_ACMEFOLDER} ]; then - echo -e "${idsCL[Yellow]}Installing acme.sh scripts on vCenter${idsCL[Default]}\n" + 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" 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" + 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