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
838d3ddc
Unverified
Commit
838d3ddc
authored
Apr 22, 2018
by
neil
Committed by
GitHub
Apr 22, 2018
Browse files
Merge pull request #1550 from Neilpang/dev
sync
parents
9f5ef4c1
66686de4
Changes
1
Show whitespace changes
Inline
Side-by-side
acme.sh
View file @
838d3ddc
...
@@ -4287,20 +4287,21 @@ $_authorizations_map"
...
@@ -4287,20 +4287,21 @@ $_authorizations_map"
Le_NextRenewTime=$(_math "$Le_NextRenewTime" - 86400)
Le_NextRenewTime=$(_math "$Le_NextRenewTime" - 86400)
_savedomainconf "Le_NextRenewTime" "$Le_NextRenewTime"
_savedomainconf "Le_NextRenewTime" "$Le_NextRenewTime"
if
!
_on_issue_success
"
$_post_hook
"
"
$_renew_hook
"
;
then
_err
"Call hook error."
return
1
fi
if [ "$_real_cert$_real_key$_real_ca$_reload_cmd$_real_fullchain" ]; then
if [ "$_real_cert$_real_key$_real_ca$_reload_cmd$_real_fullchain" ]; then
_savedomainconf "Le_RealCertPath" "$_real_cert"
_savedomainconf "Le_RealCertPath" "$_real_cert"
_savedomainconf "Le_RealCACertPath" "$_real_ca"
_savedomainconf "Le_RealCACertPath" "$_real_ca"
_savedomainconf "Le_RealKeyPath" "$_real_key"
_savedomainconf "Le_RealKeyPath" "$_real_key"
_savedomainconf "Le_ReloadCmd" "$_reload_cmd"
_savedomainconf "Le_ReloadCmd" "$_reload_cmd"
_savedomainconf "Le_RealFullChainPath" "$_real_fullchain"
_savedomainconf "Le_RealFullChainPath" "$_real_fullchain"
_installcert
"
$_main_domain
"
"
$_real_cert
"
"
$_real_key
"
"
$_real_ca
"
"
$_real_fullchain
"
"
$_reload_cmd
"
if ! _installcert "$_main_domain" "$_real_cert" "$_real_key" "$_real_ca" "$_real_fullchain" "$_reload_cmd"; then
return 1
fi
fi
fi
if ! _on_issue_success "$_post_hook" "$_renew_hook"; then
_err "Call hook error."
return 1
fi
}
}
#domain [isEcc]
#domain [isEcc]
...
@@ -5514,6 +5515,7 @@ Parameters:
...
@@ -5514,6 +5515,7 @@ Parameters:
--openssl-bin Specifies a custom openssl bin location.
--openssl-bin Specifies a custom openssl bin location.
--use-wget Force to use wget, if you have both curl and wget installed.
--use-wget Force to use wget, if you have both curl and wget installed.
--yes-I-know-dns-manual-mode-enough-go-ahead-please Force to use dns manual mode: $_DNS_MANUAL_WIKI
--yes-I-know-dns-manual-mode-enough-go-ahead-please Force to use dns manual mode: $_DNS_MANUAL_WIKI
--branch, -b Only valid for '--upgrade' command, specifies the branch name to upgrade to.
"
"
}
}
...
@@ -6058,6 +6060,10 @@ _process() {
...
@@ -6058,6 +6060,10 @@ _process() {
_use_wget="1"
_use_wget="1"
ACME_USE_WGET="1"
ACME_USE_WGET="1"
;;
;;
--branch | -b)
export BRANCH="$2"
shift
;;
*)
*)
_err "Unknown parameter : $1"
_err "Unknown parameter : $1"
return 1
return 1
...
...
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