Browse Source

skip creating accountkey/domainkey if already existing

neil 9 years ago
parent
commit
41e3eafa90
1 changed files with 13 additions and 6 deletions
  1. 13 6
      acme.sh

+ 13 - 6
acme.sh

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