mirror of
https://github.com/acmesh-official/acme.sh.git
synced 2025-05-11 03:04:12 +00:00
Removed empty lines cleaned trailing spaces
This commit is contained in:
parent
869ab53d87
commit
364f851152
@ -17,21 +17,17 @@ dns_rackspace_add() {
|
|||||||
_debug fulldomain="$fulldomain"
|
_debug fulldomain="$fulldomain"
|
||||||
txtvalue="$2"
|
txtvalue="$2"
|
||||||
_debug txtvalue="$txtvalue"
|
_debug txtvalue="$txtvalue"
|
||||||
|
|
||||||
_rackspace_check_auth || return 1
|
_rackspace_check_auth || return 1
|
||||||
_rackspace_check_rootzone || return 1
|
_rackspace_check_rootzone || return 1
|
||||||
|
|
||||||
_info "Creating TXT record."
|
_info "Creating TXT record."
|
||||||
if ! _rackspace_rest POST "$RACKSPACE_Tenant/domains/$_domain_id/records" "{\"records\":[{\"name\":\"$fulldomain\",\"type\":\"TXT\",\"data\":\"$txtvalue\",\"ttl\":300}]}"; then
|
if ! _rackspace_rest POST "$RACKSPACE_Tenant/domains/$_domain_id/records" "{\"records\":[{\"name\":\"$fulldomain\",\"type\":\"TXT\",\"data\":\"$txtvalue\",\"ttl\":300}]}"; then
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
_debug2 response "$response"
|
_debug2 response "$response"
|
||||||
|
|
||||||
if ! _contains "$response" "$txtvalue" >/dev/null; then
|
if ! _contains "$response" "$txtvalue" >/dev/null; then
|
||||||
_err "Could not add TXT record."
|
_err "Could not add TXT record."
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
#fulldomain txtvalue
|
#fulldomain txtvalue
|
||||||
@ -40,26 +36,21 @@ dns_rackspace_rm() {
|
|||||||
_debug fulldomain="$fulldomain"
|
_debug fulldomain="$fulldomain"
|
||||||
txtvalue=$2
|
txtvalue=$2
|
||||||
_debug txtvalue="$txtvalue"
|
_debug txtvalue="$txtvalue"
|
||||||
|
|
||||||
_rackspace_check_auth || return 1
|
_rackspace_check_auth || return 1
|
||||||
_rackspace_check_rootzone || return 1
|
_rackspace_check_rootzone || return 1
|
||||||
|
|
||||||
_info "Checking for TXT record."
|
_info "Checking for TXT record."
|
||||||
if ! _get_recordid "$_domain_id" "$fulldomain" "$txtvalue"; then
|
if ! _get_recordid "$_domain_id" "$fulldomain" "$txtvalue"; then
|
||||||
_err "Could not get TXT record id."
|
_err "Could not get TXT record id."
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$_dns_record_id" = "" ]; then
|
if [ "$_dns_record_id" = "" ]; then
|
||||||
_err "TXT record not found."
|
_err "TXT record not found."
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
_info "Removing TXT record."
|
_info "Removing TXT record."
|
||||||
if ! _delete_txt_record "$_domain_id" "$_dns_record_id"; then
|
if ! _delete_txt_record "$_domain_id" "$_dns_record_id"; then
|
||||||
_err "Could not remove TXT record $_dns_record_id."
|
_err "Could not remove TXT record $_dns_record_id."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -80,12 +71,10 @@ _get_root_zone() {
|
|||||||
#not valid
|
#not valid
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! _rackspace_rest GET "$RACKSPACE_Tenant/domains"; then
|
if ! _rackspace_rest GET "$RACKSPACE_Tenant/domains"; then
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
_debug2 response "$response"
|
_debug2 response "$response"
|
||||||
|
|
||||||
if _contains "$response" "\"name\":\"$h\"" >/dev/null; then
|
if _contains "$response" "\"name\":\"$h\"" >/dev/null; then
|
||||||
_domain_id=$(echo "$response" | sed -n "s/^.*\"name\":\"$h\",\"id\":\([^,]*\),.*/\1/p")
|
_domain_id=$(echo "$response" | sed -n "s/^.*\"name\":\"$h\",\"id\":\([^,]*\),.*/\1/p")
|
||||||
if [ -n "$_domain_id" ]; then
|
if [ -n "$_domain_id" ]; then
|
||||||
@ -104,17 +93,14 @@ _get_recordid() {
|
|||||||
domainid="$1"
|
domainid="$1"
|
||||||
fulldomain="$2"
|
fulldomain="$2"
|
||||||
txtvalue="$3"
|
txtvalue="$3"
|
||||||
|
|
||||||
if ! _rackspace_rest GET "$RACKSPACE_Tenant/domains/$domainid/records?name=$fulldomain&type=TXT"; then
|
if ! _rackspace_rest GET "$RACKSPACE_Tenant/domains/$domainid/records?name=$fulldomain&type=TXT"; then
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
_debug response "$response"
|
_debug response "$response"
|
||||||
|
|
||||||
if ! _contains "$response" "$txtvalue"; then
|
if ! _contains "$response" "$txtvalue"; then
|
||||||
_dns_record_id=0
|
_dns_record_id=0
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
_dns_record_id=$(echo "$response" | tr '{' "\n" | grep "\"data\":\"$txtvalue\"" | sed -n 's/^.*"id":"\([^"]*\)".*/\1/p')
|
_dns_record_id=$(echo "$response" | tr '{' "\n" | grep "\"data\":\"$txtvalue\"" | sed -n 's/^.*"id":"\([^"]*\)".*/\1/p')
|
||||||
_debug _dns_record_id "$_dns_record_id"
|
_debug _dns_record_id "$_dns_record_id"
|
||||||
return 0
|
return 0
|
||||||
@ -122,16 +108,13 @@ _get_recordid() {
|
|||||||
_delete_txt_record() {
|
_delete_txt_record() {
|
||||||
domainid="$1"
|
domainid="$1"
|
||||||
_dns_record_id="$2"
|
_dns_record_id="$2"
|
||||||
|
|
||||||
if ! _rackspace_rest DELETE "$RACKSPACE_Tenant/domains/$domainid/records?id=$_dns_record_id"; then
|
if ! _rackspace_rest DELETE "$RACKSPACE_Tenant/domains/$domainid/records?id=$_dns_record_id"; then
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
_debug response "$response"
|
_debug response "$response"
|
||||||
|
|
||||||
if ! _contains "$response" "RUNNING"; then
|
if ! _contains "$response" "RUNNING"; then
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
_rackspace_rest() {
|
_rackspace_rest() {
|
||||||
@ -139,12 +122,10 @@ _rackspace_rest() {
|
|||||||
ep="$2"
|
ep="$2"
|
||||||
data="$3"
|
data="$3"
|
||||||
_debug ep "$ep"
|
_debug ep "$ep"
|
||||||
|
|
||||||
export _H1="Accept: application/json"
|
export _H1="Accept: application/json"
|
||||||
export _H2="X-Auth-Token: $RACKSPACE_Token"
|
export _H2="X-Auth-Token: $RACKSPACE_Token"
|
||||||
export _H3="X-Project-Id: $RACKSPACE_Tenant"
|
export _H3="X-Project-Id: $RACKSPACE_Tenant"
|
||||||
export _H4="Content-Type: application/json"
|
export _H4="Content-Type: application/json"
|
||||||
|
|
||||||
if [ "$m" != "GET" ]; then
|
if [ "$m" != "GET" ]; then
|
||||||
_debug data "$data"
|
_debug data "$data"
|
||||||
response="$(_post "$data" "$RACKSPACE_Endpoint/$ep" "" "$m")"
|
response="$(_post "$data" "$RACKSPACE_Endpoint/$ep" "" "$m")"
|
||||||
@ -185,7 +166,6 @@ _rackspace_check_auth() {
|
|||||||
# retrieve the rackspace creds
|
# retrieve the rackspace creds
|
||||||
RACKSPACE_Username="${RACKSPACE_Username:-$(_readaccountconf_mutable RACKSPACE_Username)}"
|
RACKSPACE_Username="${RACKSPACE_Username:-$(_readaccountconf_mutable RACKSPACE_Username)}"
|
||||||
RACKSPACE_Apikey="${RACKSPACE_Apikey:-$(_readaccountconf_mutable RACKSPACE_Apikey)}"
|
RACKSPACE_Apikey="${RACKSPACE_Apikey:-$(_readaccountconf_mutable RACKSPACE_Apikey)}"
|
||||||
|
|
||||||
# check their vals for null
|
# check their vals for null
|
||||||
if [ -z "$RACKSPACE_Username" ] || [ -z "$RACKSPACE_Apikey" ]; then
|
if [ -z "$RACKSPACE_Username" ] || [ -z "$RACKSPACE_Apikey" ]; then
|
||||||
RACKSPACE_Username=""
|
RACKSPACE_Username=""
|
||||||
@ -194,11 +174,9 @@ _rackspace_check_auth() {
|
|||||||
_err "Please set those values and try again."
|
_err "Please set those values and try again."
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# save the username and api key to the account conf file.
|
# save the username and api key to the account conf file.
|
||||||
_saveaccountconf_mutable RACKSPACE_Username "$RACKSPACE_Username"
|
_saveaccountconf_mutable RACKSPACE_Username "$RACKSPACE_Username"
|
||||||
_saveaccountconf_mutable RACKSPACE_Apikey "$RACKSPACE_Apikey"
|
_saveaccountconf_mutable RACKSPACE_Apikey "$RACKSPACE_Apikey"
|
||||||
|
|
||||||
if [ -z "$RACKSPACE_Token" ]; then
|
if [ -z "$RACKSPACE_Token" ]; then
|
||||||
_info "Getting authorization token."
|
_info "Getting authorization token."
|
||||||
if ! _rackspace_authorization; then
|
if ! _rackspace_authorization; then
|
||||||
|
Loading…
x
Reference in New Issue
Block a user