Merge pull request #4192 from skyksandr/master

Vultr Api: Update to v2
This commit is contained in:
neil 2022-07-19 10:51:04 +08:00 committed by GitHub
commit de0419228f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3,10 +3,10 @@
# #
#VULTR_API_KEY=000011112222333344445555666677778888 #VULTR_API_KEY=000011112222333344445555666677778888
VULTR_Api="https://api.vultr.com/v1" VULTR_Api="https://api.vultr.com/v2"
######## Public functions ##################### ######## Public functions #####################
#
#Usage: add _acme-challenge.www.domain.com "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs" #Usage: add _acme-challenge.www.domain.com "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
dns_vultr_add() { dns_vultr_add() {
fulldomain=$1 fulldomain=$1
@ -31,14 +31,14 @@ dns_vultr_add() {
_debug _domain "$_domain" _debug _domain "$_domain"
_debug 'Getting txt records' _debug 'Getting txt records'
_vultr_rest GET "dns/records?domain=$_domain" _vultr_rest GET "domains/$_domain/records"
if printf "%s\n" "$response" | grep -- "\"type\":\"TXT\",\"name\":\"$fulldomain\"" >/dev/null; then if printf "%s\n" "$response" | grep -- "\"type\":\"TXT\",\"name\":\"$fulldomain\"" >/dev/null; then
_err 'Error' _err 'Error'
return 1 return 1
fi fi
if ! _vultr_rest POST 'dns/create_record' "domain=$_domain&name=$_sub_domain&data=\"$txtvalue\"&type=TXT"; then if ! _vultr_rest POST "domains/$_domain/records" "{\"name\":\"$_sub_domain\",\"data\":\"$txtvalue\",\"type\":\"TXT\"}"; then
_err "$response" _err "$response"
return 1 return 1
fi fi
@ -71,14 +71,14 @@ dns_vultr_rm() {
_debug _domain "$_domain" _debug _domain "$_domain"
_debug 'Getting txt records' _debug 'Getting txt records'
_vultr_rest GET "dns/records?domain=$_domain" _vultr_rest GET "domains/$_domain/records"
if printf "%s\n" "$response" | grep -- "\"type\":\"TXT\",\"name\":\"$fulldomain\"" >/dev/null; then if printf "%s\n" "$response" | grep -- "\"type\":\"TXT\",\"name\":\"$fulldomain\"" >/dev/null; then
_err 'Error' _err 'Error'
return 1 return 1
fi fi
_record_id="$(echo "$response" | tr '{}' '\n' | grep '"TXT"' | grep -- "$txtvalue" | tr ',' '\n' | grep -i 'RECORDID' | cut -d : -f 2)" _record_id="$(echo "$response" | tr '{}' '\n' | grep '"TXT"' | grep -- "$txtvalue" | tr ',' '\n' | grep -i 'id' | cut -d : -f 2)"
_debug _record_id "$_record_id" _debug _record_id "$_record_id"
if [ "$_record_id" ]; then if [ "$_record_id" ]; then
_info "Successfully retrieved the record id for ACME challenge." _info "Successfully retrieved the record id for ACME challenge."
@ -87,7 +87,7 @@ dns_vultr_rm() {
return 0 return 0
fi fi
if ! _vultr_rest POST 'dns/delete_record' "domain=$_domain&RECORDID=$_record_id"; then if ! _vultr_rest DELETE "domains/$_domain/records/$_record_id"; then
_err "$response" _err "$response"
return 1 return 1
fi fi
@ -112,11 +112,11 @@ _get_root() {
return 1 return 1
fi fi
if ! _vultr_rest GET "dns/list"; then if ! _vultr_rest GET "domains"; then
return 1 return 1
fi fi
if printf "%s\n" "$response" | grep '^\[.*\]' >/dev/null; then if printf "%s\n" "$response" | grep '^\{.*\}' >/dev/null; then
if _contains "$response" "\"domain\":\"$_domain\""; then if _contains "$response" "\"domain\":\"$_domain\""; then
_sub_domain="$(echo "$fulldomain" | sed "s/\\.$_domain\$//")" _sub_domain="$(echo "$fulldomain" | sed "s/\\.$_domain\$//")"
return 0 return 0
@ -141,8 +141,8 @@ _vultr_rest() {
api_key_trimmed=$(echo $VULTR_API_KEY | tr -d '"') api_key_trimmed=$(echo $VULTR_API_KEY | tr -d '"')
export _H1="Api-Key: $api_key_trimmed" export _H1="Authorization: Bearer $api_key_trimmed"
export _H2='Content-Type: application/x-www-form-urlencoded' export _H2='Content-Type: application/json'
if [ "$m" != "GET" ]; then if [ "$m" != "GET" ]; then
_debug data "$data" _debug data "$data"