plantroon/acme.sh
1
0
Fork 0
mirror of https://github.com/plantroon/acme.sh.git synced 2024-11-09 16:01:46 +00:00
Code Issues Projects Releases Wiki Activity

Change error to info in case record already exists.

Browse Source
This commit is contained in:
Nick Stepa 2020-01-12 15:16:48 +01:00
parent e5f69f0815
commit 4eff3b6a24
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dnsapi/dns_yandex.sh
View File

@ -15,19 +15,18 @@
dns_yandex_add() { dns_yandex_add() {
fulldomain="${1}" fulldomain="${1}"
txtvalue="${2}" txtvalue="${2}"
_debug "Calling: dns_yandex_add() '${fulldomain}' '$txtvalue'" _debug "Calling: dns_yandex_add() '${fulldomain}' '${txtvalue}'"
_PDD_credentials || return 1 _PDD_credentials || return 1
_PDD_get_domain "$fulldomain" || return 1 _PDD_get_domain || return 1
_debug "Found suitable domain: $domain" _debug "Found suitable domain: $domain"
_PDD_get_record_ids "${domain}" "${subdomain}" || return 1 _PDD_get_record_ids || return 1
_debug "Record_ids: $record_ids" _debug "Record_ids: $record_ids"
if [ ! -z "$record_ids" ]; then if [ ! -z "$record_ids" ]; then
_err "Remove all existing $subdomain records from $domain" _info "All existing $subdomain records from $domain will be removed at the very end."
return 1
fi fi
data="domain=${domain}&type=TXT&subdomain=${subdomain}&ttl=300&content=${txtvalue}" data="domain=${domain}&type=TXT&subdomain=${subdomain}&ttl=300&content=${txtvalue}"
@ -36,8 +35,12 @@ dns_yandex_add() {
_debug "Result: $result" _debug "Result: $result"
if ! _contains "$result" '"success":"ok"'; then if ! _contains "$result" '"success":"ok"'; then
_err "Can't add $subdomain to $domain" if _contains "$result" '"success":"error"' && _contains "$result" '"error":"record_exists"'; then
return 1 _info "Record already exists."
else
_err "Can't add $subdomain to $domain."
return 1
fi
fi fi
} }
@ -61,7 +64,7 @@ dns_yandex_rm() {
_debug "Result: $result" _debug "Result: $result"
if ! _contains "$result" '"success":"ok"'; then if ! _contains "$result" '"success":"ok"'; then
_info "Can't remove $subdomain from $domain" _info "Can't remove $subdomain from $domain."
fi fi
done done
} }
@ -69,8 +72,6 @@ dns_yandex_rm() {
#################### Private functions below ################################## #################### Private functions below ##################################
_PDD_get_domain() { _PDD_get_domain() {
fulldomain=${1}
subdomain_start=1 subdomain_start=1
while true; do while true; do
domain_start=$(_math $subdomain_start + 1) domain_start=$(_math $subdomain_start + 1)
@ -96,8 +97,8 @@ _PDD_get_domain() {
_PDD_credentials() { _PDD_credentials() {
if [ -z "${PDD_Token}" ]; then if [ -z "${PDD_Token}" ]; then
PDD_Token="" PDD_Token=""
_err "You need to export PDD_Token=xxxxxxxxxxxxxxxxx" _err "You need to export PDD_Token=xxxxxxxxxxxxxxxxx."
_err "You can get it at https://pddimp.yandex.ru/api2/admin/get_token" _err "You can get it at https://pddimp.yandex.ru/api2/admin/get_token."
return 1 return 1
else else
_saveaccountconf PDD_Token "${PDD_Token}" _saveaccountconf PDD_Token "${PDD_Token}"
@ -106,9 +107,6 @@ _PDD_credentials() {
} }
_PDD_get_record_ids() { _PDD_get_record_ids() {
domain="${1}"
subdomain="${2}"
_debug "Check existing records for $subdomain" _debug "Check existing records for $subdomain"
uri="https://pddimp.yandex.ru/api2/admin/dns/list?domain=${domain}" uri="https://pddimp.yandex.ru/api2/admin/dns/list?domain=${domain}"