From d18afb8a8670d2153e97dea78efc3a87e939b541 Mon Sep 17 00:00:00 2001 From: AVLUX Date: Sat, 12 Mar 2016 16:14:20 -0600 Subject: [PATCH] fixing concatenations of cert parts --- le.sh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/le.sh b/le.sh index 8a34e8bd..6f69e49a 100755 --- a/le.sh +++ b/le.sh @@ -440,10 +440,10 @@ _initpath() { CA_CERT_PATH="$domainhome/ca.cer" fi if [ -z "$KEY_CERT_PATH" ] ; then - KEY_CERT_PATH="$domainhome/$domain/key_cert.cer" + KEY_CERT_PATH="$domainhome/$domain.key_cert.cer" fi if [ -z "$KEY_CERT_CA_PATH" ] ; then - KEY_CERT_CA_PATH="$domainhome/$domain/key_cert_ca.cer" + KEY_CERT_CA_PATH="$domainhome/$domain.key_cert_ca.cer" fi } @@ -920,15 +920,10 @@ issue() { echo -----END CERTIFICATE----- >> "$CERT_PATH" _info "Cert success." cat "$CERT_PATH" - _info "Your cert is in $CERT_PATH" - cat "$Le_RealKeyPath" > "$KEY_CERT_PATH" + cat "$CERT_KEY_PATH" > "$KEY_CERT_PATH" cat "$CERT_PATH" >> "$KEY_CERT_PATH" - - cat "$KEY_CERT_PATH" > "$KEY_CERT_CA_PATH" - cat "$Le_RealCACertPath" >> "$KEY_CERT_CA_PATH" - fi @@ -948,6 +943,9 @@ issue() { curl --silent "$Le_LinkIssuer" | openssl base64 -e >> "$CA_CERT_PATH" echo -----END CERTIFICATE----- >> "$CA_CERT_PATH" _info "The intermediate CA cert is in $CA_CERT_PATH" + + cat "$KEY_CERT_PATH" > "$KEY_CERT_CA_PATH" + cat "$CA_CERT_PATH" >> "$KEY_CERT_CA_PATH" fi Le_CertCreateTime=$(date -u "+%s")