Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Acme.Sh
Commits
68878054
Unverified
Commit
68878054
authored
May 04, 2022
by
neil
Committed by
GitHub
May 04, 2022
Browse files
Merge pull request #4067 from acmesh-official/dev
sync
parents
641f6977
7f9074ad
Changes
1
Show whitespace changes
Inline
Side-by-side
acme.sh
View file @
68878054
...
@@ -4382,10 +4382,6 @@ issue() {
...
@@ -4382,10 +4382,6 @@ issue() {
_alt_domains
=
""
_alt_domains
=
""
fi
fi
if
[
"
$_key_length
"
=
"
$NO_VALUE
"
]
;
then
_key_length
=
""
fi
if
!
_on_before_issue
"
$_web_roots
"
"
$_main_domain
"
"
$_alt_domains
"
"
$_pre_hook
"
"
$_local_addr
"
;
then
if
!
_on_before_issue
"
$_web_roots
"
"
$_main_domain
"
"
$_alt_domains
"
"
$_pre_hook
"
"
$_local_addr
"
;
then
_err
"_on_before_issue."
_err
"_on_before_issue."
return
1
return
1
...
@@ -5327,6 +5323,10 @@ renew() {
...
@@ -5327,6 +5323,10 @@ renew() {
Le_PostHook
=
"
$(
_readdomainconf Le_PostHook
)
"
Le_PostHook
=
"
$(
_readdomainconf Le_PostHook
)
"
Le_RenewHook
=
"
$(
_readdomainconf Le_RenewHook
)
"
Le_RenewHook
=
"
$(
_readdomainconf Le_RenewHook
)
"
Le_Preferred_Chain
=
"
$(
_readdomainconf Le_Preferred_Chain
)
"
Le_Preferred_Chain
=
"
$(
_readdomainconf Le_Preferred_Chain
)
"
#when renew from an old version, the empty Le_Keylength means 2048
if
[
-z
"
$Le_Keylength
"
]
;
then
Le_Keylength
=
2048
fi
issue
"
$Le_Webroot
"
"
$Le_Domain
"
"
$Le_Alt
"
"
$Le_Keylength
"
"
$Le_RealCertPath
"
"
$Le_RealKeyPath
"
"
$Le_RealCACertPath
"
"
$Le_ReloadCmd
"
"
$Le_RealFullChainPath
"
"
$Le_PreHook
"
"
$Le_PostHook
"
"
$Le_RenewHook
"
"
$Le_LocalAddress
"
"
$Le_ChallengeAlias
"
"
$Le_Preferred_Chain
"
"
$Le_Valid_From
"
"
$Le_Valid_To
"
issue
"
$Le_Webroot
"
"
$Le_Domain
"
"
$Le_Alt
"
"
$Le_Keylength
"
"
$Le_RealCertPath
"
"
$Le_RealKeyPath
"
"
$Le_RealCACertPath
"
"
$Le_ReloadCmd
"
"
$Le_RealFullChainPath
"
"
$Le_PreHook
"
"
$Le_PostHook
"
"
$Le_RenewHook
"
"
$Le_LocalAddress
"
"
$Le_ChallengeAlias
"
"
$Le_Preferred_Chain
"
"
$Le_Valid_From
"
"
$Le_Valid_To
"
res
=
"
$?
"
res
=
"
$?
"
if
[
"
$res
"
!=
"0"
]
;
then
if
[
"
$res
"
!=
"0"
]
;
then
...
@@ -7087,8 +7087,8 @@ _process() {
...
@@ -7087,8 +7087,8 @@ _process() {
_altdomains
=
"
$NO_VALUE
"
_altdomains
=
"
$NO_VALUE
"
_webroot
=
""
_webroot
=
""
_challenge_alias
=
""
_challenge_alias
=
""
_keylength
=
""
_keylength
=
"
$DEFAULT_DOMAIN_KEY_LENGTH
"
_accountkeylength
=
""
_accountkeylength
=
"
$DEFAULT_ACCOUNT_KEY_LENGTH
"
_cert_file
=
""
_cert_file
=
""
_key_file
=
""
_key_file
=
""
_ca_file
=
""
_ca_file
=
""
...
...
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