ervin/acme.sh
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

record the deploy failed hooks, and try to deploy again at next renew time.

Browse Source 
and do not stop deploy other hooks on one hook failed.
This commit is contained in:
lisongmin 2021-01-31 00:23:36 +08:00
parent e6dea4c92c
commit 8995c1547e
No known key found for this signature in database
GPG Key ID: 989E105F73407D49
1 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
acme.sh
View File

@ -5059,11 +5059,17 @@ renew() {
if [ -z "$FORCE" ] && [ "$Le_NextRenewTime" ] && [ "$(_time)" -lt "$Le_NextRenewTime" ]; then if [ -z "$FORCE" ] && [ "$Le_NextRenewTime" ] && [ "$(_time)" -lt "$Le_NextRenewTime" ]; then
_info "Skip, Next renewal time is: $(__green "$Le_NextRenewTimeStr")" _info "Skip, Next renewal time is: $(__green "$Le_NextRenewTimeStr")"
_info "Add '$(__red '--force')' to force to renew." _info "Add '$(__red '--force')' to force to renew."
if [ -n "$Le_ReDeployHook" ]; then
_deploy "$Le_Domain" "$Le_ReDeployHook"
fi
return "$RENEW_SKIP" return "$RENEW_SKIP"
fi fi
if [ "$_ACME_IN_CRON" = "1" ] && [ -z "$Le_CertCreateTime" ]; then if [ "$_ACME_IN_CRON" = "1" ] && [ -z "$Le_CertCreateTime" ]; then
_info "Skip invalid cert for: $Le_Domain" _info "Skip invalid cert for: $Le_Domain"
if [ -n "$Le_ReDeployHook" ]; then
_deploy "$Le_Domain" "$Le_ReDeployHook"
fi
return $RENEW_SKIP return $RENEW_SKIP
fi fi
@ -5354,37 +5360,46 @@ _deploy() {
_d="$1" _d="$1"
_hooks="$2" _hooks="$2"
local _rc=0
local _failed_hooks=""
for _d_api in $(echo "$_hooks" | tr ',' " "); do for _d_api in $(echo "$_hooks" | tr ',' " "); do
_deployApi="$(_findHook "$_d" $_SUB_FOLDER_DEPLOY "$_d_api")" _deployApi="$(_findHook "$_d" $_SUB_FOLDER_DEPLOY "$_d_api")"
if [ -z "$_deployApi" ]; then if [ -z "$_deployApi" ]; then
_err "The deploy hook $_d_api is not found." _err "The deploy hook $_d_api is not found."
return 1 _rc=1
continue
fi fi
_debug _deployApi "$_deployApi" _debug _deployApi "$_deployApi"
if ! ( if ! . "$_deployApi"; then
if ! . "$_deployApi"; then _err "Load file $_deployApi error. Please check your api file and try again."
_err "Load file $_deployApi error. Please check your api file and try again." _rc=1
return 1 continue
fi fi
d_command="${_d_api}_deploy" d_command="${_d_api}_deploy"
if ! _exists "$d_command"; then if ! _exists "$d_command"; then
_err "It seems that your api file is not correct, it must have a function named: $d_command" _err "It seems that your api file is not correct, it must have a function named: $d_command"
return 1 _rc=1
fi continue
fi
if ! $d_command "$_d" "$CERT_KEY_PATH" "$CERT_PATH" "$CA_CERT_PATH" "$CERT_FULLCHAIN_PATH"; then if ! $d_command "$_d" "$CERT_KEY_PATH" "$CERT_PATH" "$CA_CERT_PATH" "$CERT_FULLCHAIN_PATH"; then
_err "Error deploy for domain:$_d" _err "Error deploy for domain:$_d"
return 1 _rc=1
fi _failed_hooks="$_failed_hooks,$d_api"
); then continue
_err "Deploy error."
return 1
else
_info "$(__green Success)"
fi fi
done done
_savedomainconf "Le_ReDeployHook" "${_failed_hooks#,}"
if [ $_rc -ne 0 ]; then
_err "Deploy error."
return 1
else
_info "$(__green Success)"
fi
} }
#domain hooks #domain hooks