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
ca19bbd3
Unverified
Commit
ca19bbd3
authored
Apr 04, 2020
by
neil
Committed by
GitHub
Apr 04, 2020
Browse files
Merge pull request #2831 from olibu/dev
Dev
parents
9984a168
7595808d
Changes
1
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
ca19bbd3
...
@@ -3417,13 +3417,13 @@ _regAccount() {
...
@@ -3417,13 +3417,13 @@ _regAccount() {
if [ "$ACME_VERSION" = "2" ]; then
if [ "$ACME_VERSION" = "2" ]; then
regjson='{"termsOfServiceAgreed": true}'
regjson='{"termsOfServiceAgreed": true}'
if [ "$ACCOUNT_EMAIL" ]; then
if [ "$ACCOUNT_EMAIL" ]; then
regjson='{"contact": ["mailto:
'$ACCOUNT_EMAIL'"], "termsOfServiceAgreed": true}'
regjson='{"contact": ["mailto:'$ACCOUNT_EMAIL'"], "termsOfServiceAgreed": true}'
fi
fi
else
else
_reg_res="$ACME_NEW_ACCOUNT_RES"
_reg_res="$ACME_NEW_ACCOUNT_RES"
regjson='{"resource": "'$_reg_res'", "terms-of-service-agreed": true, "agreement": "'$ACME_AGREEMENT'"}'
regjson='{"resource": "'$_reg_res'", "terms-of-service-agreed": true, "agreement": "'$ACME_AGREEMENT'"}'
if [ "$ACCOUNT_EMAIL" ]; then
if [ "$ACCOUNT_EMAIL" ]; then
regjson='{"resource": "'$_reg_res'", "contact": ["mailto:
'$ACCOUNT_EMAIL'"], "terms-of-service-agreed": true, "agreement": "'$ACME_AGREEMENT'"}'
regjson='{"resource": "'$_reg_res'", "contact": ["mailto:'$ACCOUNT_EMAIL'"], "terms-of-service-agreed": true, "agreement": "'$ACME_AGREEMENT'"}'
fi
fi
fi
fi
...
@@ -3503,7 +3503,7 @@ updateaccount() {
...
@@ -3503,7 +3503,7 @@ updateaccount() {
if [ "$ACME_VERSION" = "2" ]; then
if [ "$ACME_VERSION" = "2" ]; then
if [ "$ACCOUNT_EMAIL" ]; then
if [ "$ACCOUNT_EMAIL" ]; then
updjson='{"contact": ["mailto:
'$ACCOUNT_EMAIL'"]}'
updjson='{"contact": ["mailto:'$ACCOUNT_EMAIL'"]}'
fi
fi
else
else
# ACMEv1: Updates happen the same way a registration is done.
# ACMEv1: Updates happen the same way a registration is done.
...
@@ -4019,7 +4019,7 @@ issue() {
...
@@ -4019,7 +4019,7 @@ issue() {
#for dns manual mode
#for dns manual mode
_savedomainconf "Le_OrderFinalize" "$Le_OrderFinalize"
_savedomainconf "Le_OrderFinalize" "$Le_OrderFinalize"
_authorizations_seg="$(echo "$response" | _egrep_o '"authorizations" *: *\[[^\]*\]' | cut -d '[' -f 2 | tr -d ']' | tr -d '"')"
_authorizations_seg="$(echo "$response" | _egrep_o '"authorizations" *: *\[[^\
[
]*\]' | cut -d '[' -f 2 | tr -d ']' | tr -d '"')"
_debug2 _authorizations_seg "$_authorizations_seg"
_debug2 _authorizations_seg "$_authorizations_seg"
if [ -z "$_authorizations_seg" ]; then
if [ -z "$_authorizations_seg" ]; then
_err "_authorizations_seg not found."
_err "_authorizations_seg not found."
...
...
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