Merge 0a784b2aaab1864229f1c6ffb3a8aa02e584790c into b0ff770b0e22f2ef16d7c6212d0e0af89c73ba69

This commit is contained in:
Andrew vonderLuft 2016-03-17 01:43:31 +00:00
commit 3027cda0fe

14
le.sh
View File

@ -547,6 +547,12 @@ _initpath() {
if [ -z "$CERT_FULLCHAIN_PATH" ] ; then
CERT_FULLCHAIN_PATH="$domainhome/fullchain.cer"
fi
if [ -z "$KEY_WITH_CERT_PATH" ] ; then
KEY_WITH_CERT_PATH="$domainhome/key_cert.cer"
fi
if [ -z "$KEY_WITH_FULLCHAIN_PATH" ] ; then
KEY_WITH_FULLCHAIN_PATH="$domainhome/key_fullchain.cer"
fi
}
@ -1019,6 +1025,9 @@ issue() {
_info "Your cert is in $CERT_PATH"
cp "$CERT_PATH" "$CERT_FULLCHAIN_PATH"
cat "$CERT_KEY_PATH" > "$KEY_WITH_CERT_PATH"
cat "$CERT_PATH" >> "$KEY_WITH_CERT_PATH"
fi
@ -1040,6 +1049,9 @@ issue() {
_info "The intermediate CA cert is in $CA_CERT_PATH"
cat "$CA_CERT_PATH" >> "$CERT_FULLCHAIN_PATH"
_info "And the full chain certs is there: $CERT_FULLCHAIN_PATH"
cat "$CERT_KEY_PATH" > "$KEY_WITH_FULLCHAIN_PATH"
cat "$CERT_FULLCHAIN_PATH" >> "$KEY_WITH_FULLCHAIN_PATH"
fi
Le_CertCreateTime=$(date -u "+%s")
@ -1129,6 +1141,8 @@ renewAll() {
CERT_PATH=""
CA_CERT_PATH=""
CERT_FULLCHAIN_PATH=""
KEY_WITH_CERT_PATH=""
KEY_WITH_FULLCHAIN_PATH=""
ACCOUNT_KEY_PATH=""
wellknown_path=""