diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index f8e8c909..64397982 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -1936,8 +1936,9 @@ NODEUPDATE() { VCENTER-SSL(){ VCHOSTNAME='vcenter.scity.us' - #CERTDIR="/etc/letsencrypt/live/${VCHOSTNAME}" - CERTDIR="/opt/nginx-proxy/ssl/${VCHOSTNAME}" + #BASECERTDIR="/etc/letsencrypt/live" + BASECERTDIR="/opt/nginx-proxy/ssl" + CERTDIR="${BASECERTDIR}/${VCHOSTNAME}" SERVER="https://${VCHOSTNAME}" CRED="administrator@scity.vs:$(pass iDSVC)" @@ -1958,9 +1959,16 @@ VCENTER-SSL(){ fi echo -en "${idsCL[LightCyan]}Updating certificate on vCenter... ${idsCL[Default]}" + + rm -f $CERTDIR/fullcert.pem + cat $CERTDIR/cert.pem > $CERTDIR/fullcert.pem + cat $CERTDIR/chain.pem >> $CERTDIR/fullcert.pem + cat $BASECERTDIR/isrgrootx1.pem >> $CERTDIR/fullcert.pem + + SESSION_ID=$(curl -s -X POST --header 'Content-Type: application/json' --header 'Accept: application/json' --header 'vmware-use-header-authn: test' --header 'vmware-api-session-id: null' -u $CRED "$SERVER/rest/com/vmware/cis/session" --insecure | python3 -c "import sys, json; print(json.load(sys.stdin)['value'])") PRIVKEY=$(awk -v ORS='\\n' '1' "$CERTDIR/privkey.pem") - CERT=$(awk -v ORS='\\n' '1' "$CERTDIR/cert.pem") + CERT=$(awk -v ORS='\\n' '1' "$CERTDIR/fullcert.pem") REQUEST_BODY="{ \"spec\" : { \"cert\" : \"$CERT\", \"key\" : \"$PRIVKEY\" } }" curl --insecure -X PUT "$SERVER/rest/vcenter/certificate-management/vcenter/tls" \ -H "vmware-api-session-id: $SESSION_ID" \