Merge pull request #1806 from Aarup/dev

Update dns api to support v2 wildcard cert #1261

dnsapi/dns_unoeuro.sh

@@ -50,8 +50,6 @@ dns_unoeuro_add() {
     _err "Error"
     return 1
   fi
-
-  if ! _contains "$response" "$_sub_domain" >/dev/null; then
   _info "Adding record"
 
   if _uno_rest POST "my/products/$h/dns/records" "{\"name\":\"$fulldomain\",\"type\":\"TXT\",\"data\":\"$txtvalue\",\"ttl\":120}"; then
@@ -63,22 +61,6 @@ dns_unoeuro_add() {
       return 1
     fi
   fi
-    _err "Add txt record error."
-  else
-    _info "Updating record"
-    record_line_number=$(echo "$response" | grep -n "$_sub_domain" | cut -d : -f 1)
-    record_line_number=$(_math "$record_line_number" - 1)
-    record_id=$(echo "$response" | _head_n "$record_line_number" | _tail_n 1 1 | _egrep_o "[0-9]{1,}")
-    _debug "record_id" "$record_id"
-
-    _uno_rest PUT "my/products/$h/dns/records/$record_id" "{\"name\":\"$fulldomain\",\"type\":\"TXT\",\"data\":\"$txtvalue\",\"ttl\":120}"
-    if _contains "$response" "\"status\": 200" >/dev/null; then
-      _info "Updated, OK"
-      return 0
-    fi
-    _err "Update error"
-    return 1
-  fi
 }
 
 #fulldomain txtvalue
@@ -122,8 +104,9 @@ dns_unoeuro_rm() {
   if ! _contains "$response" "$_sub_domain"; then
     _info "Don't need to remove."
   else
-    record_line_number=$(echo "$response" | grep -n "$_sub_domain" | cut -d : -f 1)
+    for record_line_number in $(echo "$response" | grep -n "$_sub_domain" | cut -d : -f 1); do
       record_line_number=$(_math "$record_line_number" - 1)
+      _debug "record_line_number" "$record_line_number"
       record_id=$(echo "$response" | _head_n "$record_line_number" | _tail_n 1 1 | _egrep_o "[0-9]{1,}")
       _debug "record_id" "$record_id"
 
@@ -137,8 +120,8 @@ dns_unoeuro_rm() {
         return 1
       fi
       _contains "$response" "\"status\": 200"
+    done
   fi
-
 }
 
 ####################  Private functions below ##################################