Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
Acme.Sh
Commits
b10929fe
Unverified
Commit
b10929fe
authored
Mar 12, 2019
by
neil
Committed by
GitHub
Mar 12, 2019
Browse files
Merge pull request #2154 from Neilpang/vv
use acme v2 as default
parents
f512cb8e
f2add8de
Changes
1
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
b10929fe
...
@@ -19,8 +19,8 @@ LETSENCRYPT_STAGING_CA_V1="https://acme-staging.api.letsencrypt.org/directory"
...
@@ -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_CA_V2
=
"https://acme-v02.api.letsencrypt.org/directory"
LETSENCRYPT_STAGING_CA_V2
=
"https://acme-staging-v02.api.letsencrypt.org/directory"
LETSENCRYPT_STAGING_CA_V2
=
"https://acme-staging-v02.api.letsencrypt.org/directory"
DEFAULT_CA
=
$LETSENCRYPT_CA_V
1
DEFAULT_CA
=
$LETSENCRYPT_CA_V
2
DEFAULT_STAGING_CA
=
$LETSENCRYPT_STAGING_CA_V
1
DEFAULT_STAGING_CA
=
$LETSENCRYPT_STAGING_CA_V
2
DEFAULT_USER_AGENT
=
"
$PROJECT_NAME
/
$VER
(
$PROJECT
)"
DEFAULT_USER_AGENT
=
"
$PROJECT_NAME
/
$VER
(
$PROJECT
)"
DEFAULT_ACCOUNT_EMAIL
=
""
DEFAULT_ACCOUNT_EMAIL
=
""
...
@@ -3665,8 +3665,12 @@ issue() {
...
@@ -3665,8 +3665,12 @@ issue() {
_cleardomainconf
"Le_ChallengeAlias"
_cleardomainconf
"Le_ChallengeAlias"
fi
fi
Le_API
=
"
$ACME_DIRECTORY
"
if
[
"
$ACME_DIRECTORY
"
!=
"
$DEFAULT_CA
"
]
;
then
_savedomainconf
"Le_API"
"
$Le_API
"
Le_API
=
"
$ACME_DIRECTORY
"
_savedomainconf
"Le_API"
"
$Le_API
"
else
_cleardomainconf Le_API
fi
if
[
"
$_alt_domains
"
=
"
$NO_VALUE
"
]
;
then
if
[
"
$_alt_domains
"
=
"
$NO_VALUE
"
]
;
then
_alt_domains
=
""
_alt_domains
=
""
...
@@ -4500,6 +4504,16 @@ renew() {
...
@@ -4500,6 +4504,16 @@ renew() {
.
"
$DOMAIN_CONF
"
.
"
$DOMAIN_CONF
"
_debug Le_API
"
$Le_API
"
_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
[
"
$Le_API
"
]
;
then
if
[
"
$_OLD_CA_HOST
"
=
"
$Le_API
"
]
;
then
if
[
"
$_OLD_CA_HOST
"
=
"
$Le_API
"
]
;
then
export
Le_API
=
"
$DEFAULT_CA
"
export
Le_API
=
"
$DEFAULT_CA
"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment