nihilist/acme.sh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

skip creating accountkey/domainkey if already existing

Browse Source
This commit is contained in:
neil 2016-04-15 21:27:32 +08:00
parent 937cbf6df8
commit 41e3eafa90
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
acme.sh
View File

@ -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,10 +1043,12 @@ issue() {
_info "Skip register account key" _info "Skip register account key"
fi fi
if [[ ! -f "$CERT_KEY_PATH" ]] ; then
if ! createDomainKey $Le_Domain $Le_Keylength ; then if ! createDomainKey $Le_Domain $Le_Keylength ; then
_err "Create domain key error." _err "Create domain key error."
return 1 return 1
fi fi
fi
if ! createCSR $Le_Domain $Le_Alt ; then if ! createCSR $Le_Domain $Le_Alt ; then
_err "Create CSR error." _err "Create CSR error."