|
|
@ -321,7 +321,7 @@ createDomainKey() {
|
|
|
|
return 0
|
|
|
|
return 0
|
|
|
|
else
|
|
|
|
else
|
|
|
|
_err "Domain key exists, do you want to overwrite the key?"
|
|
|
|
_err "Domain key exists, do you want to overwrite the key?"
|
|
|
|
_err "Set FORCE=1, and try again."
|
|
|
|
_err "Add '--force', and try again."
|
|
|
|
return 1
|
|
|
|
return 1
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
@ -1003,7 +1003,12 @@ issue() {
|
|
|
|
usingApache=""
|
|
|
|
usingApache=""
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
createAccountKey $Le_Domain $Le_Keylength
|
|
|
|
if [[ ! -f "$ACCOUNT_KEY_PATH" ]] ; then
|
|
|
|
|
|
|
|
if ! createAccountKey $Le_Domain $Le_Keylength ; then
|
|
|
|
|
|
|
|
_err "Create account key error."
|
|
|
|
|
|
|
|
return 1
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
if ! _calcjwk "$ACCOUNT_KEY_PATH" ; then
|
|
|
|
if ! _calcjwk "$ACCOUNT_KEY_PATH" ; then
|
|
|
|
return 1
|
|
|
|
return 1
|
|
|
@ -1038,9 +1043,11 @@ issue() {
|
|
|
|
_info "Skip register account key"
|
|
|
|
_info "Skip register account key"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
if ! createDomainKey $Le_Domain $Le_Keylength ; then
|
|
|
|
if [[ ! -f "$CERT_KEY_PATH" ]] ; then
|
|
|
|
_err "Create domain key error."
|
|
|
|
if ! createDomainKey $Le_Domain $Le_Keylength ; then
|
|
|
|
return 1
|
|
|
|
_err "Create domain key error."
|
|
|
|
|
|
|
|
return 1
|
|
|
|
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
if ! createCSR $Le_Domain $Le_Alt ; then
|
|
|
|
if ! createCSR $Le_Domain $Le_Alt ; then
|
|
|
|