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
f803c6c0
Commit
f803c6c0
authored
Jun 15, 2019
by
neilpang
Browse files
fix
https://github.com/Neilpang/acme.sh/issues/2341
parent
c6b68551
Changes
1
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
f803c6c0
...
@@ -4712,6 +4712,8 @@ renewAll() {
...
@@ -4712,6 +4712,8 @@ renewAll() {
_skipped_msg=""
_skipped_msg=""
_error_level=$NOTIFY_LEVEL_SKIP
_error_level=$NOTIFY_LEVEL_SKIP
_notify_code=$RENEW_SKIP
_notify_code=$RENEW_SKIP
_set_level=${NOTIFY_LEVEL:-$NOTIFY_LEVEL_DEFAULT}
_debug "_set_level" "$_set_level"
for di in "${CERT_HOME}"/*.*/; do
for di in "${CERT_HOME}"/*.*/; do
_debug di "$di"
_debug di "$di"
if ! [ -d "$di" ]; then
if ! [ -d "$di" ]; then
...
@@ -4735,7 +4737,7 @@ renewAll() {
...
@@ -4735,7 +4737,7 @@ renewAll() {
_notify_code=0
_notify_code=0
fi
fi
if [ "$ACME_IN_CRON" ]; then
if [ "$ACME_IN_CRON" ]; then
if
[
"
$NOTIFY_LEVEL
"
]
&&
[
$NOTIFY_LEVEL
-ge
$NOTIFY_LEVEL_RENEW
]
;
then
if [
$_set_level
-ge $NOTIFY_LEVEL_RENEW ]; then
if [ "$NOTIFY_MODE" = "$NOTIFY_MODE_CERT" ]; then
if [ "$NOTIFY_MODE" = "$NOTIFY_MODE_CERT" ]; then
_send_notify "Renew $d success" "Good, the cert is renewed." "$NOTIFY_HOOK" 0
_send_notify "Renew $d success" "Good, the cert is renewed." "$NOTIFY_HOOK" 0
fi
fi
...
@@ -4749,7 +4751,7 @@ renewAll() {
...
@@ -4749,7 +4751,7 @@ renewAll() {
_notify_code=$RENEW_SKIP
_notify_code=$RENEW_SKIP
fi
fi
if [ "$ACME_IN_CRON" ]; then
if [ "$ACME_IN_CRON" ]; then
if
[
"
$NOTIFY_LEVEL
"
]
&&
[
$NOTIFY_LEVEL
-ge
$NOTIFY_LEVEL_SKIP
]
;
then
if [
$_set_level
-ge $NOTIFY_LEVEL_SKIP ]; then
if [ "$NOTIFY_MODE" = "$NOTIFY_MODE_CERT" ]; then
if [ "$NOTIFY_MODE" = "$NOTIFY_MODE_CERT" ]; then
_send_notify "Renew $d skipped" "Good, the cert is skipped." "$NOTIFY_HOOK" "$RENEW_SKIP"
_send_notify "Renew $d skipped" "Good, the cert is skipped." "$NOTIFY_HOOK" "$RENEW_SKIP"
fi
fi
...
@@ -4764,7 +4766,7 @@ renewAll() {
...
@@ -4764,7 +4766,7 @@ renewAll() {
_notify_code=1
_notify_code=1
fi
fi
if [ "$ACME_IN_CRON" ]; then
if [ "$ACME_IN_CRON" ]; then
if
[
"
$NOTIFY_LEVEL
"
]
&&
[
$NOTIFY_LEVEL
-ge
$NOTIFY_LEVEL_ERROR
]
;
then
if [
$_set_level
-ge $NOTIFY_LEVEL_ERROR ]; then
if [ "$NOTIFY_MODE" = "$NOTIFY_MODE_CERT" ]; then
if [ "$NOTIFY_MODE" = "$NOTIFY_MODE_CERT" ]; then
_send_notify "Renew $d error" "There is an error." "$NOTIFY_HOOK" 1
_send_notify "Renew $d error" "There is an error." "$NOTIFY_HOOK" 1
fi
fi
...
@@ -4783,7 +4785,7 @@ renewAll() {
...
@@ -4783,7 +4785,7 @@ renewAll() {
fi
fi
done
done
_debug _error_level "$_error_level"
_debug _error_level "$_error_level"
if
[
"
$ACME_IN_CRON
"
]
&&
[
$_error_level
-le
$
NOTIFY_LEVEL
]
;
then
if [ "$ACME_IN_CRON" ] && [ $_error_level -le $
_set_level
]; then
if [ -z "$NOTIFY_MODE" ] || [ "$NOTIFY_MODE" = "$NOTIFY_MODE_BULK" ]; then
if [ -z "$NOTIFY_MODE" ] || [ "$NOTIFY_MODE" = "$NOTIFY_MODE_BULK" ]; then
_msg_subject="Renew"
_msg_subject="Renew"
if [ "$_error_msg" ]; then
if [ "$_error_msg" ]; then
...
...
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