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
902c08e9
Commit
902c08e9
authored
Mar 08, 2020
by
neil
Browse files
Merge branch 'dev' of
https://github.com/acmesh-official/acme.sh
into dev
parents
ea652c02
39ced21a
Changes
2
Show whitespace changes
Inline
Side-by-side
acme.sh
View file @
902c08e9
...
@@ -3517,6 +3517,7 @@ updateaccount() {
...
@@ -3517,6 +3517,7 @@ updateaccount() {
_send_signed_request
"
$_accUri
"
"
$updjson
"
_send_signed_request
"
$_accUri
"
"
$updjson
"
if
[
"
$code
"
=
'200'
]
;
then
if
[
"
$code
"
=
'200'
]
;
then
echo
"
$response
"
>
"
$ACCOUNT_JSON_PATH
"
_info
"account update success for
$_accUri
."
_info
"account update success for
$_accUri
."
else
else
_info
"Error. The account was not updated."
_info
"Error. The account was not updated."
...
...
dnsapi/dns_aws.sh
View file @
902c08e9
...
@@ -23,6 +23,7 @@ dns_aws_add() {
...
@@ -23,6 +23,7 @@ dns_aws_add() {
AWS_ACCESS_KEY_ID
=
"
${
AWS_ACCESS_KEY_ID
:-
$(
_readaccountconf_mutable AWS_ACCESS_KEY_ID
)
}
"
AWS_ACCESS_KEY_ID
=
"
${
AWS_ACCESS_KEY_ID
:-
$(
_readaccountconf_mutable AWS_ACCESS_KEY_ID
)
}
"
AWS_SECRET_ACCESS_KEY
=
"
${
AWS_SECRET_ACCESS_KEY
:-
$(
_readaccountconf_mutable AWS_SECRET_ACCESS_KEY
)
}
"
AWS_SECRET_ACCESS_KEY
=
"
${
AWS_SECRET_ACCESS_KEY
:-
$(
_readaccountconf_mutable AWS_SECRET_ACCESS_KEY
)
}
"
AWS_DNS_SLOWRATE
=
"
${
AWS_DNS_SLOWRATE
:-
$(
_readaccountconf_mutable AWS_DNS_SLOWRATE
)
}
"
if
[
-z
"
$AWS_ACCESS_KEY_ID
"
]
||
[
-z
"
$AWS_SECRET_ACCESS_KEY
"
]
;
then
if
[
-z
"
$AWS_ACCESS_KEY_ID
"
]
||
[
-z
"
$AWS_SECRET_ACCESS_KEY
"
]
;
then
_use_container_role
||
_use_instance_role
_use_container_role
||
_use_instance_role
...
@@ -40,6 +41,7 @@ dns_aws_add() {
...
@@ -40,6 +41,7 @@ dns_aws_add() {
if
[
-z
"
$_using_role
"
]
;
then
if
[
-z
"
$_using_role
"
]
;
then
_saveaccountconf_mutable AWS_ACCESS_KEY_ID
"
$AWS_ACCESS_KEY_ID
"
_saveaccountconf_mutable AWS_ACCESS_KEY_ID
"
$AWS_ACCESS_KEY_ID
"
_saveaccountconf_mutable AWS_SECRET_ACCESS_KEY
"
$AWS_SECRET_ACCESS_KEY
"
_saveaccountconf_mutable AWS_SECRET_ACCESS_KEY
"
$AWS_SECRET_ACCESS_KEY
"
_saveaccountconf_mutable AWS_DNS_SLOWRATE
"
$AWS_DNS_SLOWRATE
"
fi
fi
_debug
"First detect the root zone"
_debug
"First detect the root zone"
...
@@ -77,7 +79,13 @@ dns_aws_add() {
...
@@ -77,7 +79,13 @@ dns_aws_add() {
if
aws_rest POST
"2013-04-01
$_domain_id
/rrset/"
""
"
$_aws_tmpl_xml
"
&&
_contains
"
$response
"
"ChangeResourceRecordSetsResponse"
;
then
if
aws_rest POST
"2013-04-01
$_domain_id
/rrset/"
""
"
$_aws_tmpl_xml
"
&&
_contains
"
$response
"
"ChangeResourceRecordSetsResponse"
;
then
_info
"TXT record updated successfully."
_info
"TXT record updated successfully."
if
[
-n
"
$AWS_DNS_SLOWRATE
"
]
;
then
_info
"Slow rate activated: sleeping for
$AWS_DNS_SLOWRATE
seconds"
_sleep
"
$AWS_DNS_SLOWRATE
"
else
_sleep 1
_sleep 1
fi
return
0
return
0
fi
fi
_sleep 1
_sleep 1
...
@@ -91,6 +99,7 @@ dns_aws_rm() {
...
@@ -91,6 +99,7 @@ dns_aws_rm() {
AWS_ACCESS_KEY_ID
=
"
${
AWS_ACCESS_KEY_ID
:-
$(
_readaccountconf_mutable AWS_ACCESS_KEY_ID
)
}
"
AWS_ACCESS_KEY_ID
=
"
${
AWS_ACCESS_KEY_ID
:-
$(
_readaccountconf_mutable AWS_ACCESS_KEY_ID
)
}
"
AWS_SECRET_ACCESS_KEY
=
"
${
AWS_SECRET_ACCESS_KEY
:-
$(
_readaccountconf_mutable AWS_SECRET_ACCESS_KEY
)
}
"
AWS_SECRET_ACCESS_KEY
=
"
${
AWS_SECRET_ACCESS_KEY
:-
$(
_readaccountconf_mutable AWS_SECRET_ACCESS_KEY
)
}
"
AWS_DNS_SLOWRATE
=
"
${
AWS_DNS_SLOWRATE
:-
$(
_readaccountconf_mutable AWS_DNS_SLOWRATE
)
}
"
if
[
-z
"
$AWS_ACCESS_KEY_ID
"
]
||
[
-z
"
$AWS_SECRET_ACCESS_KEY
"
]
;
then
if
[
-z
"
$AWS_ACCESS_KEY_ID
"
]
||
[
-z
"
$AWS_SECRET_ACCESS_KEY
"
]
;
then
_use_container_role
||
_use_instance_role
_use_container_role
||
_use_instance_role
...
@@ -125,7 +134,13 @@ dns_aws_rm() {
...
@@ -125,7 +134,13 @@ dns_aws_rm() {
if
aws_rest POST
"2013-04-01
$_domain_id
/rrset/"
""
"
$_aws_tmpl_xml
"
&&
_contains
"
$response
"
"ChangeResourceRecordSetsResponse"
;
then
if
aws_rest POST
"2013-04-01
$_domain_id
/rrset/"
""
"
$_aws_tmpl_xml
"
&&
_contains
"
$response
"
"ChangeResourceRecordSetsResponse"
;
then
_info
"TXT record deleted successfully."
_info
"TXT record deleted successfully."
if
[
-n
"
$AWS_DNS_SLOWRATE
"
]
;
then
_info
"Slow rate activated: sleeping for
$AWS_DNS_SLOWRATE
seconds"
_sleep
"
$AWS_DNS_SLOWRATE
"
else
_sleep 1
_sleep 1
fi
return
0
return
0
fi
fi
_sleep 1
_sleep 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