Fix CI-errors

This commit is contained in:
jakelamotta 2020-11-18 14:52:32 +01:00
parent c60613fbcb
commit 6cf0eb9e1d

View File

@ -7,7 +7,7 @@
# #
#SIMPLY_Api="https://api.simply.com/1/[ACCOUNTNAME]/[APIKEY]" #SIMPLY_Api="https://api.simply.com/1/[ACCOUNTNAME]/[APIKEY]"
SIMPLY_Api="https://api.simply.com/1" SIMPLY_Api_Default="https://api.simply.com/1"
######## Public functions ##################### ######## Public functions #####################
#Usage: add _acme-challenge.www.domain.com "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs" #Usage: add _acme-challenge.www.domain.com "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
@ -22,6 +22,7 @@ dns_simply_add() {
_simply_save_config _simply_save_config
_debug "First detect the root zone" _debug "First detect the root zone"
if ! _get_root "$fulldomain"; then if ! _get_root "$fulldomain"; then
_err "invalid domain" _err "invalid domain"
return 1 return 1
@ -69,23 +70,28 @@ dns_simply_rm() {
fi fi
records=$(echo "$response" | tr '{' "\n" | grep 'record_id\|type\|data\|\name' | sed 's/\"record_id/;\"record_id/') records=$(echo "$response" | tr '{' "\n" | grep 'record_id\|type\|data\|\name' | sed 's/\"record_id/;\"record_id/')
record_array=(`echo $records |tr -d ' ' | tr ';' ' '`) record_array=$(echo $records |tr -d ' ' | tr ';' ' ')
nr_of_deleted_records=0 nr_of_deleted_records=0
_info "Fetching txt record"
_info "Fetching txt record.." for record in $record_array; do
for (( i=0; i<=${#record_array[@]}; i++ )); do
record="${record_array[$i]}"
_debug record "$record" _debug record "$record"
if [[ "$record" == *"$txtvalue"* && "$record" == *"TXT"* ]]; then record_data=$(echo $record | cut -d "," -f 3 | sed 's/"//g' | grep "data" | cut -d ":" -f 2)
record_type=$(echo $record | cut -d "," -f 4 | sed 's/"//g' | grep "type" | cut -d ":" -f 2)
record_id=`echo $record | cut -d "," -f 1 | grep "record_id" | cut -d ":" -f 2` _debug2 record_data "$record_data"
_debug2 record_type "$record_type"
if [ "$record_data" = "$txtvalue" ] && [ "$record_type" = "TXT" ]; then
record_id=$(echo $record | cut -d "," -f 1 | grep "record_id" | cut -d ":" -f 2)
_info "Deleting record $record" _info "Deleting record $record"
_debug2 record_id "$record_id"
if [[ $record_id -gt 0 ]]; then if [ "$record_id" -gt 0 ]; then
if ! _simply_delete_record "$_domain" "$_sub_domain" "$record_id"; then if ! _simply_delete_record "$_domain" "$_sub_domain" "$record_id"; then
_err "Record with id $record_id could not be deleted" _err "Record with id $record_id could not be deleted"
@ -102,7 +108,7 @@ dns_simply_rm() {
done done
if [[ $nr_of_deleted_records -eq 0 ]]; then if [ "$nr_of_deleted_records" -eq 0 ]; then
_err "No record deleted, the DNS record needs to be removed manually." _err "No record deleted, the DNS record needs to be removed manually."
else else
_info "Deleted $nr_of_deleted_records record" _info "Deleted $nr_of_deleted_records record"