From f2add8de94e0ad9646f86dba3ea8666c9e39b348 Mon Sep 17 00:00:00 2001
From: neilpang <neil@neilpang.com>
Date: Tue, 12 Mar 2019 21:16:15 +0800
Subject: [PATCH] use acme v2 as default
---
acme.sh | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/acme.sh b/acme.sh
index a31cf085..b3ccf9ee 100755
--- a/acme.sh
+++ b/acme.sh
@@ -19,8 +19,8 @@ LETSENCRYPT_STAGING_CA_V1="https://acme-staging.api.letsencrypt.org/directory"
LETSENCRYPT_CA_V2="https://acme-v02.api.letsencrypt.org/directory"
LETSENCRYPT_STAGING_CA_V2="https://acme-staging-v02.api.letsencrypt.org/directory"
-DEFAULT_CA=$LETSENCRYPT_CA_V1
-DEFAULT_STAGING_CA=$LETSENCRYPT_STAGING_CA_V1
+DEFAULT_CA=$LETSENCRYPT_CA_V2
+DEFAULT_STAGING_CA=$LETSENCRYPT_STAGING_CA_V2
DEFAULT_USER_AGENT="$PROJECT_NAME/$VER ($PROJECT)"
DEFAULT_ACCOUNT_EMAIL=""
@@ -3665,8 +3665,12 @@ issue() {
_cleardomainconf "Le_ChallengeAlias"
fi
- Le_API="$ACME_DIRECTORY"
- _savedomainconf "Le_API" "$Le_API"
+ if [ "$ACME_DIRECTORY" != "$DEFAULT_CA" ]; then
+ Le_API="$ACME_DIRECTORY"
+ _savedomainconf "Le_API" "$Le_API"
+ else
+ _cleardomainconf Le_API
+ fi
if [ "$_alt_domains" = "$NO_VALUE" ]; then
_alt_domains=""
@@ -4500,6 +4504,16 @@ renew() {
. "$DOMAIN_CONF"
_debug Le_API "$Le_API"
+
+ if [ "$Le_API" = "$LETSENCRYPT_CA_V1" ]; then
+ _cleardomainconf Le_API
+ Le_API="$DEFAULT_CA"
+ fi
+ if [ "$Le_API" = "$LETSENCRYPT_STAGING_CA_V1" ]; then
+ _cleardomainconf Le_API
+ Le_API="$DEFAULT_STAGING_CA"
+ fi
+
if [ "$Le_API" ]; then
if [ "$_OLD_CA_HOST" = "$Le_API" ]; then
export Le_API="$DEFAULT_CA"