From 7588fc0989dcfb5f99da70a3ad70621b54cef533 Mon Sep 17 00:00:00 2001
From: Chris <chga@multinet.se>
Date: Mon, 26 Mar 2018 09:32:41 +0200
Subject: [PATCH 1/2] Fixes DNSimple for Wildcard certificates

---
 dnsapi/dns_dnsimple.sh | 49 +++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/dnsapi/dns_dnsimple.sh b/dnsapi/dns_dnsimple.sh
index 0bfe2b99..0a5b79bb 100644
--- a/dnsapi/dns_dnsimple.sh
+++ b/dnsapi/dns_dnsimple.sh
@@ -39,7 +39,7 @@ dns_dnsimple_add() {
 
   _get_records "$_account_id" "$_domain" "$_sub_domain"
 
-  if [ "$_records_count" = "0" ]; then
+# if [ "$_records_count" = "0" ]; then
     _info "Adding record"
     if _dnsimple_rest POST "$_account_id/zones/$_domain/records" "{\"type\":\"TXT\",\"name\":\"$_sub_domain\",\"content\":\"$txtvalue\",\"ttl\":120}"; then
       if printf -- "%s" "$response" | grep "\"name\":\"$_sub_domain\"" >/dev/null; then
@@ -51,22 +51,22 @@ dns_dnsimple_add() {
       fi
     fi
     _err "Add txt record error."
-  else
-    _info "Updating record"
-    _extract_record_id "$_records" "$_sub_domain"
+# else
+#   _info "Updating record"
+#   _extract_record_id "$_records" "$_sub_domain"
 
-    if _dnsimple_rest \
-      PATCH \
-      "$_account_id/zones/$_domain/records/$_record_id" \
-      "{\"type\":\"TXT\",\"name\":\"$_sub_domain\",\"content\":\"$txtvalue\",\"ttl\":120}"; then
+#   if _dnsimple_rest \
+#     PATCH \
+#     "$_account_id/zones/$_domain/records/$_record_id" \
+#     "{\"type\":\"TXT\",\"name\":\"$_sub_domain\",\"content\":\"$txtvalue\",\"ttl\":120}"; then
 
-      _info "Updated!"
-      return 0
-    fi
+#     _info "Updated!"
+#     return 0
+#   fi
 
-    _err "Update error"
-    return 1
-  fi
+#   _err "Update error"
+#   return 1
+# fi
 }
 
 # fulldomain
@@ -84,19 +84,20 @@ dns_dnsimple_rm() {
   fi
 
   _get_records "$_account_id" "$_domain" "$_sub_domain"
+
   _extract_record_id "$_records" "$_sub_domain"
-
   if [ "$_record_id" ]; then
-
-    if _dnsimple_rest DELETE "$_account_id/zones/$_domain/records/$_record_id"; then
-      _info "removed record" "$_record_id"
-      return 0
-    fi
+    echo "$_record_id" | while read -r item
+    do
+      if _dnsimple_rest DELETE "$_account_id/zones/$_domain/records/$item"; then
+        _info "removed record" "$item"
+        return 0
+      else
+        _err "failed to remove record" "$item"
+        return 1
+      fi
+    done
   fi
-
-  _err "failed to remove record" "$_record_id"
-  return 1
-
 }
 
 ####################  Private functions bellow ##################################

From 30283282d2f99afcfd39c45e4b3cdbaa0fef4035 Mon Sep 17 00:00:00 2001
From: Chris <chga@multinet.se>
Date: Mon, 26 Mar 2018 09:40:33 +0200
Subject: [PATCH 2/2] Fixing code style according to Travis

---
 dnsapi/dns_dnsimple.sh | 40 +++++++++++-----------------------------
 1 file changed, 11 insertions(+), 29 deletions(-)

diff --git a/dnsapi/dns_dnsimple.sh b/dnsapi/dns_dnsimple.sh
index 0a5b79bb..0dd3918a 100644
--- a/dnsapi/dns_dnsimple.sh
+++ b/dnsapi/dns_dnsimple.sh
@@ -39,34 +39,17 @@ dns_dnsimple_add() {
 
   _get_records "$_account_id" "$_domain" "$_sub_domain"
 
-# if [ "$_records_count" = "0" ]; then
-    _info "Adding record"
-    if _dnsimple_rest POST "$_account_id/zones/$_domain/records" "{\"type\":\"TXT\",\"name\":\"$_sub_domain\",\"content\":\"$txtvalue\",\"ttl\":120}"; then
-      if printf -- "%s" "$response" | grep "\"name\":\"$_sub_domain\"" >/dev/null; then
-        _info "Added"
-        return 0
-      else
-        _err "Unexpected response while adding text record."
-        return 1
-      fi
+  _info "Adding record"
+  if _dnsimple_rest POST "$_account_id/zones/$_domain/records" "{\"type\":\"TXT\",\"name\":\"$_sub_domain\",\"content\":\"$txtvalue\",\"ttl\":120}"; then
+    if printf -- "%s" "$response" | grep "\"name\":\"$_sub_domain\"" >/dev/null; then
+      _info "Added"
+      return 0
+    else
+      _err "Unexpected response while adding text record."
+      return 1
     fi
-    _err "Add txt record error."
-# else
-#   _info "Updating record"
-#   _extract_record_id "$_records" "$_sub_domain"
-
-#   if _dnsimple_rest \
-#     PATCH \
-#     "$_account_id/zones/$_domain/records/$_record_id" \
-#     "{\"type\":\"TXT\",\"name\":\"$_sub_domain\",\"content\":\"$txtvalue\",\"ttl\":120}"; then
-
-#     _info "Updated!"
-#     return 0
-#   fi
-
-#   _err "Update error"
-#   return 1
-# fi
+  fi
+  _err "Add txt record error."
 }
 
 # fulldomain
@@ -87,8 +70,7 @@ dns_dnsimple_rm() {
 
   _extract_record_id "$_records" "$_sub_domain"
   if [ "$_record_id" ]; then
-    echo "$_record_id" | while read -r item
-    do
+    echo "$_record_id" | while read -r item; do
       if _dnsimple_rest DELETE "$_account_id/zones/$_domain/records/$item"; then
         _info "removed record" "$item"
         return 0