yacloud/acme.sh
1
0
Fork 0
mirror of https://github.com/acmesh-official/acme.sh.git synced 2025-04-30 07:22:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing concatenations of cert parts

Browse Source
This commit is contained in:
AVLUX 2016-03-12 16:14:20 -06:00
parent 4bb155521e
commit d18afb8a86
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
le.sh
View File

@ -440,10 +440,10 @@ _initpath() {
CA_CERT_PATH="$domainhome/ca.cer" CA_CERT_PATH="$domainhome/ca.cer"
fi fi
if [ -z "$KEY_CERT_PATH" ] ; then if [ -z "$KEY_CERT_PATH" ] ; then
KEY_CERT_PATH="$domainhome/$domain/key_cert.cer" KEY_CERT_PATH="$domainhome/$domain.key_cert.cer"
fi fi
if [ -z "$KEY_CERT_CA_PATH" ] ; then 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 fi
} }
@ -920,15 +920,10 @@ issue() {
echo -----END CERTIFICATE----- >> "$CERT_PATH" echo -----END CERTIFICATE----- >> "$CERT_PATH"
_info "Cert success." _info "Cert success."
cat "$CERT_PATH" cat "$CERT_PATH"
_info "Your cert is in $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 "$CERT_PATH" >> "$KEY_CERT_PATH"
cat "$KEY_CERT_PATH" > "$KEY_CERT_CA_PATH"
cat "$Le_RealCACertPath" >> "$KEY_CERT_CA_PATH"
fi fi
@ -948,6 +943,9 @@ issue() {
curl --silent "$Le_LinkIssuer" | openssl base64 -e >> "$CA_CERT_PATH" curl --silent "$Le_LinkIssuer" | openssl base64 -e >> "$CA_CERT_PATH"
echo -----END CERTIFICATE----- >> "$CA_CERT_PATH" echo -----END CERTIFICATE----- >> "$CA_CERT_PATH"
_info "The intermediate CA cert is in $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 fi
Le_CertCreateTime=$(date -u "+%s") Le_CertCreateTime=$(date -u "+%s")