From b19cb0805cfe72aec1cea8b1f4fc9e5921cf0d4e Mon Sep 17 00:00:00 2001
From: jakelamotta <kristian.johansson86@gmail.com>
Date: Tue, 17 Nov 2020 13:19:55 +0100
Subject: [PATCH 01/41] Adds dnsapi support for Simply.com

---
 dnsapi/dns_simply.sh | 240 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 240 insertions(+)
 create mode 100644 dnsapi/dns_simply.sh

diff --git a/dnsapi/dns_simply.sh b/dnsapi/dns_simply.sh
new file mode 100644
index 00000000..25dd9ff3
--- /dev/null
+++ b/dnsapi/dns_simply.sh
@@ -0,0 +1,240 @@
+#!/usr/bin/env sh
+
+#
+#SIMPLY_AccountName="accountname"
+#
+#SIMPLY_ApiKey="apikey"
+#
+#SIMPLY_Api="https://api.simply.com/1/[ACCOUNTNAME]/[APIKEY]"
+
+SIMPLY_Api="https://api.simply.com/1"
+########  Public functions #####################
+
+#Usage: add  _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
+dns_simply_add() {
+  fulldomain=$1
+  txtvalue=$2
+
+  if ! _simply_load_config; then
+    return 1
+  fi
+
+  _simply_save_config
+
+  _debug "First detect the root zone"
+  if ! _get_root "$fulldomain"; then
+    _err "invalid domain"
+    return 1
+  fi
+  
+  _debug _sub_domain "$_sub_domain"
+  _debug _domain "$_domain"
+
+  _info "Adding record"
+
+  if ! _simply_add_record "$_domain" "$_sub_domain" "$txtvalue"; then  
+    _err "Could not add DNS record"
+    return 1
+  fi
+  
+  return 0
+}
+
+dns_simply_rm() {
+  fulldomain=$1
+  txtvalue=$2
+  
+  if ! _simply_load_config; then
+    return 1
+  fi
+
+  _simply_save_config
+
+  _debug "First detect the root zone"
+  
+  if ! _get_root "$fulldomain"; then
+    _err "invalid domain"
+    return 1
+  fi
+
+  _debug _sub_domain "$_sub_domain"
+  _debug _domain "$_domain"
+  _debug "$txtvalue"
+
+  _debug "Getting existing records"
+  
+  if ! _simply_get_all_records "$_domain"; then
+    _err "invalid domain"
+    return 1
+  fi
+  
+  records=$(echo "$response" | tr '{' "\n" | grep 'record_id\|type\|data\|\name' | sed 's/\"record_id/;\"record_id/')
+  record_array=(`echo $records |tr -d ' ' | tr ';' ' '`)
+  nr_of_deleted_records=0
+
+  for (( i=0; i<=${#record_array[@]}; i++ )); do
+  
+  record="${record_array[$i]}"
+  
+  if [[ "$record" == *"$txtvalue"* && "$record" == *"TXT"* ]]; then
+  
+    _info "Deleting record: $record"
+    
+    record_id=`echo $record | cut -d "," -f 1 | grep "record_id" | cut -d ":" -f 2`
+    
+    if [[ $record_id -gt 0 ]]; then
+      
+      if ! _simply_delete_record "$_domain" "$_sub_domain" "$record_id"; then
+        _err "Record with id $record_id could not be deleted"
+        return 1
+      fi
+      
+      nr_of_deleted_records=1
+      break
+    else  
+      _err "Fetching record_id could not be done, this should not happen, exiting function. Failing record is $record"
+      break
+    fi
+  fi
+  
+  done
+
+  if [[ $nr_of_deleted_records -eq 0 ]]; then
+    _err "No record deleted, the DNS record needs to be removed manually." 
+  else
+    _info "Deleted $nr_of_deleted_records record"
+  fi
+  
+  return 0
+}
+
+####################  Private functions below ##################################
+
+_simply_load_config() {
+  SIMPLY_Api="${SIMPLY_Api:-$(_readaccountconf_mutable SIMPLY_Api)}"
+  SIMPLY_AccountName="${SIMPLY_AccountName:-$(_readaccountconf_mutable SIMPLY_AccountName)}"
+  SIMPLY_ApiKey="${SIMPLY_ApiKey:-$(_readaccountconf_mutable SIMPLY_ApiKey)}"
+
+  if [ -z "$SIMPLY_Api" ]; then
+    SIMPLY_Api="$SIMPLY_Api_Default"
+  fi
+  
+  if [ -z "$SIMPLY_AccountName" ] || [ -z "$SIMPLY_ApiKey" ]; then
+    SIMPLY_AccountName=""
+    SIMPLY_ApiKey=""
+
+    _err "A valid Simply API account and apikey not provided."
+    _err "Please provide a valid API user and try again."
+
+    return 1
+  fi
+
+  return 0
+}
+
+_simply_save_config() {
+  if [ "$SIMPLY_Api" != "$SIMPLY_Api_Default" ]; then
+    _saveaccountconf_mutable SIMPLY_Api "$SIMPLY_Api"
+  fi
+  _saveaccountconf_mutable SIMPLY_AccountName "$SIMPLY_AccountName"
+  _saveaccountconf_mutable SIMPLY_ApiKey "$SIMPLY_ApiKey"
+}
+
+_simply_get_all_records() {
+  domain=$1  
+      
+  if ! _simply_rest GET "my/products/$domain/dns/records"; then
+    return 1
+  fi
+
+  return 0
+}
+
+_get_root() {
+  domain=$1
+  i=2
+  p=1
+  while true; do
+    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
+    if [ -z "$h" ]; then
+      #not valid
+      return 1
+    fi
+
+    if ! _simply_rest GET "my/products/$h/dns"; then
+      return 1
+    fi
+
+    if _contains "$response" '"code":"NOT_FOUND"'; then
+      _debug "$h not found"
+    else
+      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
+      _domain="$h"
+      return 0
+    fi
+    p="$i"
+    i=$(_math "$i" + 1)
+  done
+  return 1
+}
+
+_simply_add_record() {
+  domain=$1
+  sub_domain=$2
+  txtval=$3
+  
+  data="{\"name\": \"$sub_domain\", \"type\":\"TXT\", \"data\": \"$txtval\", \"priority\":0, \"ttl\": 3600}"
+
+  if ! _simply_rest POST "my/products/$domain/dns/records" "$data"; then
+    _err "Adding record not successfull!"
+    return 1
+  fi
+  
+  return 0
+}
+
+_simply_delete_record() {
+  domain=$1
+  sub_domain=$2
+  record_id=$3
+  
+  _debug "Delete record with id $record_id"
+  
+  if ! _simply_rest DELETE "my/products/$domain/dns/records/$record_id"; then
+    _err "Deleting record not successfull!"
+    return 1
+  fi
+  
+  return 0
+}
+
+_simply_rest() {
+  m=$1
+  ep="$2"
+  data="$3"
+    
+  _debug "Data: $data"
+  _debug "Methodcall: $ep"
+  _debug "Call type: $m"
+
+  export _H1="Content-Type: application/json"
+
+  if [ "$m" != "GET" ]; then
+    response="$(_post "$data" "$SIMPLY_Api/$SIMPLY_AccountName/$SIMPLY_ApiKey/$ep" "" "$m")"
+  else
+    response="$(_get "$SIMPLY_Api/$SIMPLY_AccountName/$SIMPLY_ApiKey/$ep")"
+  fi
+
+  if [ "$?" != "0" ]; then
+    _err "error $ep"
+    return 1
+  fi
+  
+  _debug2 response "$response"
+  
+  if _contains "$response" "Invalid account authorization"; then
+    _err "It seems that your api key or accountnumber is not correct."
+    return 1
+  fi
+  return 0
+}

From bcc1b7b48a1c848bf675e1757f896f7a18a7776e Mon Sep 17 00:00:00 2001
From: jakelamotta <kristian.johansson86@gmail.com>
Date: Tue, 17 Nov 2020 13:49:32 +0100
Subject: [PATCH 02/41] Fix comments

---
 dnsapi/dns_simply.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dnsapi/dns_simply.sh b/dnsapi/dns_simply.sh
index 25dd9ff3..3914e1ab 100644
--- a/dnsapi/dns_simply.sh
+++ b/dnsapi/dns_simply.sh
@@ -59,7 +59,7 @@ dns_simply_rm() {
 
   _debug _sub_domain "$_sub_domain"
   _debug _domain "$_domain"
-  _debug "$txtvalue"
+  _debug txtvalue "$txtvalue"
 
   _debug "Getting existing records"
   
@@ -78,9 +78,9 @@ dns_simply_rm() {
   
   if [[ "$record" == *"$txtvalue"* && "$record" == *"TXT"* ]]; then
   
-    _info "Deleting record: $record"
-    
     record_id=`echo $record | cut -d "," -f 1 | grep "record_id" | cut -d ":" -f 2`
+	
+	_info "Deleting record $record"
     
     if [[ $record_id -gt 0 ]]; then
       
@@ -198,7 +198,7 @@ _simply_delete_record() {
   sub_domain=$2
   record_id=$3
   
-  _debug "Delete record with id $record_id"
+  _debug record_id "Delete record with id $record_id"
   
   if ! _simply_rest DELETE "my/products/$domain/dns/records/$record_id"; then
     _err "Deleting record not successfull!"
@@ -213,9 +213,9 @@ _simply_rest() {
   ep="$2"
   data="$3"
     
-  _debug "Data: $data"
-  _debug "Methodcall: $ep"
-  _debug "Call type: $m"
+  _debug2 data "$data"
+  _debug2 ep "$ep"
+  _debug2 m "$m"
 
   export _H1="Content-Type: application/json"
 

From c60613fbcbea3c9518df45ff6ec99ef5de5266f4 Mon Sep 17 00:00:00 2001
From: jakelamotta <kristian.johansson86@gmail.com>
Date: Tue, 17 Nov 2020 14:20:45 +0100
Subject: [PATCH 03/41] Fix indentation and added some debug messages

---
 dnsapi/dns_simply.sh | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/dnsapi/dns_simply.sh b/dnsapi/dns_simply.sh
index 3914e1ab..8fb56585 100644
--- a/dnsapi/dns_simply.sh
+++ b/dnsapi/dns_simply.sh
@@ -61,7 +61,7 @@ dns_simply_rm() {
   _debug _domain "$_domain"
   _debug txtvalue "$txtvalue"
 
-  _debug "Getting existing records"
+  _info "Getting all existing records"
   
   if ! _simply_get_all_records "$_domain"; then
     _err "invalid domain"
@@ -71,31 +71,34 @@ dns_simply_rm() {
   records=$(echo "$response" | tr '{' "\n" | grep 'record_id\|type\|data\|\name' | sed 's/\"record_id/;\"record_id/')
   record_array=(`echo $records |tr -d ' ' | tr ';' ' '`)
   nr_of_deleted_records=0
+  
+  _info "Fetching txt record.."
 
   for (( i=0; i<=${#record_array[@]}; i++ )); do
   
-  record="${record_array[$i]}"
+    record="${record_array[$i]}"
+    _debug record "$record"
   
-  if [[ "$record" == *"$txtvalue"* && "$record" == *"TXT"* ]]; then
+    if [[ "$record" == *"$txtvalue"* && "$record" == *"TXT"* ]]; then
   
-    record_id=`echo $record | cut -d "," -f 1 | grep "record_id" | cut -d ":" -f 2`
+      record_id=`echo $record | cut -d "," -f 1 | grep "record_id" | cut -d ":" -f 2`
 	
-	_info "Deleting record $record"
+	  _info "Deleting record $record"
     
-    if [[ $record_id -gt 0 ]]; then
+      if [[ $record_id -gt 0 ]]; then
       
-      if ! _simply_delete_record "$_domain" "$_sub_domain" "$record_id"; then
-        _err "Record with id $record_id could not be deleted"
-        return 1
+        if ! _simply_delete_record "$_domain" "$_sub_domain" "$record_id"; then
+          _err "Record with id $record_id could not be deleted"
+          return 1
+        fi
+      
+        nr_of_deleted_records=1
+        break
+      else  
+        _err "Fetching record_id could not be done, this should not happen, exiting function. Failing record is $record"
+        break
       fi
-      
-      nr_of_deleted_records=1
-      break
-    else  
-      _err "Fetching record_id could not be done, this should not happen, exiting function. Failing record is $record"
-      break
     fi
-  fi
   
   done
 

From 6cf0eb9e1d5b8f831c44b93adfcb8b9d5fe1d405 Mon Sep 17 00:00:00 2001
From: jakelamotta <kristian.johansson86@gmail.com>
Date: Wed, 18 Nov 2020 14:52:32 +0100
Subject: [PATCH 04/41] Fix CI-errors

---
 dnsapi/dns_simply.sh | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/dnsapi/dns_simply.sh b/dnsapi/dns_simply.sh
index 8fb56585..9deceb25 100644
--- a/dnsapi/dns_simply.sh
+++ b/dnsapi/dns_simply.sh
@@ -7,7 +7,7 @@
 #
 #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 #####################
 
 #Usage: add  _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
@@ -22,6 +22,7 @@ dns_simply_add() {
   _simply_save_config
 
   _debug "First detect the root zone"
+  
   if ! _get_root "$fulldomain"; then
     _err "invalid domain"
     return 1
@@ -69,23 +70,28 @@ dns_simply_rm() {
   fi
   
   records=$(echo "$response" | tr '{' "\n" | grep 'record_id\|type\|data\|\name' | sed 's/\"record_id/;\"record_id/')
-  record_array=(`echo $records |tr -d ' ' | tr ';' ' '`)
-  nr_of_deleted_records=0
-  
-  _info "Fetching txt record.."
+  record_array=$(echo $records |tr -d ' ' | tr ';' ' ')
 
-  for (( i=0; i<=${#record_array[@]}; i++ )); do
-  
-    record="${record_array[$i]}"
+  nr_of_deleted_records=0
+  _info "Fetching txt record"
+
+  for record in $record_array; do 
     _debug record "$record"
+	
+	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)
+    
+	_debug2 record_data "$record_data"
+	_debug2 record_type "$record_type"
+	
+    if [ "$record_data" = "$txtvalue" ] && [ "$record_type" = "TXT" ]; then
   
-    if [[ "$record" == *"$txtvalue"* && "$record" == *"TXT"* ]]; then
-  
-      record_id=`echo $record | cut -d "," -f 1 | grep "record_id" | cut -d ":" -f 2`
+      record_id=$(echo $record | cut -d "," -f 1 | grep "record_id" | cut -d ":" -f 2)
 	
 	  _info "Deleting record $record"
-    
-      if [[ $record_id -gt 0 ]]; then
+      _debug2 record_id "$record_id"
+	  
+      if [ "$record_id" -gt 0 ]; then
       
         if ! _simply_delete_record "$_domain" "$_sub_domain" "$record_id"; then
           _err "Record with id $record_id could not be deleted"
@@ -102,7 +108,7 @@ dns_simply_rm() {
   
   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." 
   else
     _info "Deleted $nr_of_deleted_records record"

From b20d8f195ba879c4af5f35f2910541d8bbf58383 Mon Sep 17 00:00:00 2001
From: jakelamotta <kristian.johansson86@gmail.com>
Date: Wed, 18 Nov 2020 15:12:22 +0100
Subject: [PATCH 05/41] Add double quotes to variables

---
 dnsapi/dns_simply.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/dnsapi/dns_simply.sh b/dnsapi/dns_simply.sh
index 9deceb25..30211f7a 100644
--- a/dnsapi/dns_simply.sh
+++ b/dnsapi/dns_simply.sh
@@ -69,26 +69,25 @@ dns_simply_rm() {
     return 1
   fi
   
-  records=$(echo "$response" | tr '{' "\n" | grep 'record_id\|type\|data\|\name' | sed 's/\"record_id/;\"record_id/')
-  record_array=$(echo $records |tr -d ' ' | tr ';' ' ')
+  records=$(echo "$response" | tr '{' "\n" | grep 'record_id\|type\|data\|\name' | sed 's/\"record_id/;\"record_id/' | tr "\n" ' '| tr -d ' ' | tr ';' ' ')
 
   nr_of_deleted_records=0
   _info "Fetching txt record"
 
-  for record in $record_array; do 
+  for record in $records; do 
     _debug record "$record"
 	
-	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_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)
     
 	_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)
+      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

From 6ef66399f8accca401e0c55d24cb74624617bea6 Mon Sep 17 00:00:00 2001
From: jakelamotta <kristian.johansson86@gmail.com>
Date: Wed, 18 Nov 2020 15:37:26 +0100
Subject: [PATCH 06/41] Removed spaces on empty lines

---
 dnsapi/dns_simply.sh | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/dnsapi/dns_simply.sh b/dnsapi/dns_simply.sh
index 30211f7a..6f2464ef 100644
--- a/dnsapi/dns_simply.sh
+++ b/dnsapi/dns_simply.sh
@@ -21,8 +21,7 @@ dns_simply_add() {
 
   _simply_save_config
 
-  _debug "First detect the root zone"
-  
+  _debug "First detect the root zone"  
   if ! _get_root "$fulldomain"; then
     _err "invalid domain"
     return 1
@@ -36,8 +35,7 @@ dns_simply_add() {
   if ! _simply_add_record "$_domain" "$_sub_domain" "$txtvalue"; then  
     _err "Could not add DNS record"
     return 1
-  fi
-  
+  fi  
   return 0
 }
 
@@ -126,7 +124,7 @@ _simply_load_config() {
   if [ -z "$SIMPLY_Api" ]; then
     SIMPLY_Api="$SIMPLY_Api_Default"
   fi
-  
+
   if [ -z "$SIMPLY_AccountName" ] || [ -z "$SIMPLY_ApiKey" ]; then
     SIMPLY_AccountName=""
     SIMPLY_ApiKey=""
@@ -149,8 +147,8 @@ _simply_save_config() {
 }
 
 _simply_get_all_records() {
-  domain=$1  
-      
+  domain=$1
+
   if ! _simply_rest GET "my/products/$domain/dns/records"; then
     return 1
   fi
@@ -190,14 +188,14 @@ _simply_add_record() {
   domain=$1
   sub_domain=$2
   txtval=$3
-  
+
   data="{\"name\": \"$sub_domain\", \"type\":\"TXT\", \"data\": \"$txtval\", \"priority\":0, \"ttl\": 3600}"
 
   if ! _simply_rest POST "my/products/$domain/dns/records" "$data"; then
     _err "Adding record not successfull!"
     return 1
   fi
-  
+
   return 0
 }
 
@@ -205,14 +203,14 @@ _simply_delete_record() {
   domain=$1
   sub_domain=$2
   record_id=$3
-  
+
   _debug record_id "Delete record with id $record_id"
-  
+
   if ! _simply_rest DELETE "my/products/$domain/dns/records/$record_id"; then
     _err "Deleting record not successfull!"
     return 1
   fi
-  
+
   return 0
 }
 
@@ -220,7 +218,7 @@ _simply_rest() {
   m=$1
   ep="$2"
   data="$3"
-    
+
   _debug2 data "$data"
   _debug2 ep "$ep"
   _debug2 m "$m"
@@ -237,12 +235,13 @@ _simply_rest() {
     _err "error $ep"
     return 1
   fi
-  
+
   _debug2 response "$response"
-  
+
   if _contains "$response" "Invalid account authorization"; then
     _err "It seems that your api key or accountnumber is not correct."
     return 1
   fi
+  
   return 0
 }

From c7116d40caf9e3b9bc48e77b34bcc255b0609083 Mon Sep 17 00:00:00 2001
From: jakelamotta <kristian.johansson86@gmail.com>
Date: Wed, 18 Nov 2020 15:46:16 +0100
Subject: [PATCH 07/41] Removes tabs and trailing spaces

---
 dnsapi/dns_simply.sh | 45 ++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/dnsapi/dns_simply.sh b/dnsapi/dns_simply.sh
index 6f2464ef..bf383019 100644
--- a/dnsapi/dns_simply.sh
+++ b/dnsapi/dns_simply.sh
@@ -21,28 +21,29 @@ dns_simply_add() {
 
   _simply_save_config
 
-  _debug "First detect the root zone"  
+  _debug "First detect the root zone"
+
   if ! _get_root "$fulldomain"; then
     _err "invalid domain"
     return 1
   fi
-  
+
   _debug _sub_domain "$_sub_domain"
   _debug _domain "$_domain"
 
   _info "Adding record"
 
-  if ! _simply_add_record "$_domain" "$_sub_domain" "$txtvalue"; then  
+  if ! _simply_add_record "$_domain" "$_sub_domain" "$txtvalue"; then
     _err "Could not add DNS record"
     return 1
-  fi  
+  fi
   return 0
 }
 
 dns_simply_rm() {
   fulldomain=$1
   txtvalue=$2
-  
+
   if ! _simply_load_config; then
     return 1
   fi
@@ -61,12 +62,12 @@ dns_simply_rm() {
   _debug txtvalue "$txtvalue"
 
   _info "Getting all existing records"
-  
+
   if ! _simply_get_all_records "$_domain"; then
     _err "invalid domain"
     return 1
   fi
-  
+
   records=$(echo "$response" | tr '{' "\n" | grep 'record_id\|type\|data\|\name' | sed 's/\"record_id/;\"record_id/' | tr "\n" ' '| tr -d ' ' | tr ';' ' ')
 
   nr_of_deleted_records=0
@@ -74,27 +75,27 @@ dns_simply_rm() {
 
   for record in $records; do 
     _debug record "$record"
-	
-	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)
-    
-	_debug2 record_data "$record_data"
-	_debug2 record_type "$record_type"
-	
-    if [ "$record_data" = "$txtvalue" ] && [ "$record_type" = "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)
+
+  _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"
       _debug2 record_id "$record_id"
-	  
+
       if [ "$record_id" -gt 0 ]; then
-      
+
         if ! _simply_delete_record "$_domain" "$_sub_domain" "$record_id"; then
           _err "Record with id $record_id could not be deleted"
           return 1
         fi
-      
+
         nr_of_deleted_records=1
         break
       else  
@@ -102,7 +103,7 @@ dns_simply_rm() {
         break
       fi
     fi
-  
+
   done
 
   if [ "$nr_of_deleted_records" -eq 0 ]; then
@@ -110,7 +111,7 @@ dns_simply_rm() {
   else
     _info "Deleted $nr_of_deleted_records record"
   fi
-  
+
   return 0
 }
 
@@ -242,6 +243,6 @@ _simply_rest() {
     _err "It seems that your api key or accountnumber is not correct."
     return 1
   fi
-  
+
   return 0
 }

From f90f8824bb6034d90c47e6dae7acad54ffa0a056 Mon Sep 17 00:00:00 2001
From: jakelamotta <kristian.johansson86@gmail.com>
Date: Wed, 18 Nov 2020 15:52:46 +0100
Subject: [PATCH 08/41] Fix code style problems

---
 dnsapi/dns_simply.sh | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/dnsapi/dns_simply.sh b/dnsapi/dns_simply.sh
index bf383019..379f1b42 100644
--- a/dnsapi/dns_simply.sh
+++ b/dnsapi/dns_simply.sh
@@ -22,7 +22,6 @@ dns_simply_add() {
   _simply_save_config
 
   _debug "First detect the root zone"
-
   if ! _get_root "$fulldomain"; then
     _err "invalid domain"
     return 1
@@ -68,19 +67,19 @@ dns_simply_rm() {
     return 1
   fi
 
-  records=$(echo "$response" | tr '{' "\n" | grep 'record_id\|type\|data\|\name' | sed 's/\"record_id/;\"record_id/' | tr "\n" ' '| tr -d ' ' | tr ';' ' ')
+  records=$(echo "$response" | tr '{' "\n" | grep 'record_id\|type\|data\|\name' | sed 's/\"record_id/;\"record_id/' | tr "\n" ' ' | tr -d ' ' | tr ';' ' ')
 
   nr_of_deleted_records=0
   _info "Fetching txt record"
 
-  for record in $records; do 
+  for record in $records; do
     _debug record "$record"
-  
-  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)
 
-  _debug2 record_data "$record_data"
-  _debug2 record_type "$record_type"
+    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)
+
+    _debug2 record_data "$record_data"
+    _debug2 record_type "$record_type"
   
     if [ "$record_data" = "$txtvalue" ] && [ "$record_type" = "TXT" ]; then
 
@@ -98,7 +97,7 @@ dns_simply_rm() {
 
         nr_of_deleted_records=1
         break
-      else  
+      else
         _err "Fetching record_id could not be done, this should not happen, exiting function. Failing record is $record"
         break
       fi
@@ -107,7 +106,7 @@ dns_simply_rm() {
   done
 
   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
     _info "Deleted $nr_of_deleted_records record"
   fi

From 3274f9f155acb6f5ec13b9b56c8166c0fb6cc537 Mon Sep 17 00:00:00 2001
From: jakelamotta <kristian.johansson86@gmail.com>
Date: Wed, 18 Nov 2020 15:55:02 +0100
Subject: [PATCH 09/41] Fix code style problems

---
 dnsapi/dns_simply.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dnsapi/dns_simply.sh b/dnsapi/dns_simply.sh
index 379f1b42..9a9133e6 100644
--- a/dnsapi/dns_simply.sh
+++ b/dnsapi/dns_simply.sh
@@ -50,7 +50,7 @@ dns_simply_rm() {
   _simply_save_config
 
   _debug "First detect the root zone"
-  
+
   if ! _get_root "$fulldomain"; then
     _err "invalid domain"
     return 1
@@ -80,7 +80,7 @@ dns_simply_rm() {
 
     _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)

From 1e2d2abbdf668a2d307a07363d5e6e265d2dbee2 Mon Sep 17 00:00:00 2001
From: jakelamotta <kristian.johansson86@gmail.com>
Date: Wed, 18 Nov 2020 18:01:02 +0100
Subject: [PATCH 10/41] Fix comment

---
 dnsapi/dns_simply.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dnsapi/dns_simply.sh b/dnsapi/dns_simply.sh
index 9a9133e6..d053dcf6 100644
--- a/dnsapi/dns_simply.sh
+++ b/dnsapi/dns_simply.sh
@@ -8,8 +8,8 @@
 #SIMPLY_Api="https://api.simply.com/1/[ACCOUNTNAME]/[APIKEY]"
 
 SIMPLY_Api_Default="https://api.simply.com/1"
-########  Public functions #####################
 
+########  Public functions #####################
 #Usage: add  _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
 dns_simply_add() {
   fulldomain=$1

From 65c06da275c49b1675d46af91d8e0e0e366cf29e Mon Sep 17 00:00:00 2001
From: jakelamotta <kristian.johansson86@gmail.com>
Date: Tue, 17 Nov 2020 13:19:55 +0100
Subject: [PATCH 11/41] Adds dnsapi support for Simply.com

---
 dnsapi/dns_simply.sh | 240 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 240 insertions(+)
 create mode 100644 dnsapi/dns_simply.sh

diff --git a/dnsapi/dns_simply.sh b/dnsapi/dns_simply.sh
new file mode 100644
index 00000000..25dd9ff3
--- /dev/null
+++ b/dnsapi/dns_simply.sh
@@ -0,0 +1,240 @@
+#!/usr/bin/env sh
+
+#
+#SIMPLY_AccountName="accountname"
+#
+#SIMPLY_ApiKey="apikey"
+#
+#SIMPLY_Api="https://api.simply.com/1/[ACCOUNTNAME]/[APIKEY]"
+
+SIMPLY_Api="https://api.simply.com/1"
+########  Public functions #####################
+
+#Usage: add  _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
+dns_simply_add() {
+  fulldomain=$1
+  txtvalue=$2
+
+  if ! _simply_load_config; then
+    return 1
+  fi
+
+  _simply_save_config
+
+  _debug "First detect the root zone"
+  if ! _get_root "$fulldomain"; then
+    _err "invalid domain"
+    return 1
+  fi
+  
+  _debug _sub_domain "$_sub_domain"
+  _debug _domain "$_domain"
+
+  _info "Adding record"
+
+  if ! _simply_add_record "$_domain" "$_sub_domain" "$txtvalue"; then  
+    _err "Could not add DNS record"
+    return 1
+  fi
+  
+  return 0
+}
+
+dns_simply_rm() {
+  fulldomain=$1
+  txtvalue=$2
+  
+  if ! _simply_load_config; then
+    return 1
+  fi
+
+  _simply_save_config
+
+  _debug "First detect the root zone"
+  
+  if ! _get_root "$fulldomain"; then
+    _err "invalid domain"
+    return 1
+  fi
+
+  _debug _sub_domain "$_sub_domain"
+  _debug _domain "$_domain"
+  _debug "$txtvalue"
+
+  _debug "Getting existing records"
+  
+  if ! _simply_get_all_records "$_domain"; then
+    _err "invalid domain"
+    return 1
+  fi
+  
+  records=$(echo "$response" | tr '{' "\n" | grep 'record_id\|type\|data\|\name' | sed 's/\"record_id/;\"record_id/')
+  record_array=(`echo $records |tr -d ' ' | tr ';' ' '`)
+  nr_of_deleted_records=0
+
+  for (( i=0; i<=${#record_array[@]}; i++ )); do
+  
+  record="${record_array[$i]}"
+  
+  if [[ "$record" == *"$txtvalue"* && "$record" == *"TXT"* ]]; then
+  
+    _info "Deleting record: $record"
+    
+    record_id=`echo $record | cut -d "," -f 1 | grep "record_id" | cut -d ":" -f 2`
+    
+    if [[ $record_id -gt 0 ]]; then
+      
+      if ! _simply_delete_record "$_domain" "$_sub_domain" "$record_id"; then
+        _err "Record with id $record_id could not be deleted"
+        return 1
+      fi
+      
+      nr_of_deleted_records=1
+      break
+    else  
+      _err "Fetching record_id could not be done, this should not happen, exiting function. Failing record is $record"
+      break
+    fi
+  fi
+  
+  done
+
+  if [[ $nr_of_deleted_records -eq 0 ]]; then
+    _err "No record deleted, the DNS record needs to be removed manually." 
+  else
+    _info "Deleted $nr_of_deleted_records record"
+  fi
+  
+  return 0
+}
+
+####################  Private functions below ##################################
+
+_simply_load_config() {
+  SIMPLY_Api="${SIMPLY_Api:-$(_readaccountconf_mutable SIMPLY_Api)}"
+  SIMPLY_AccountName="${SIMPLY_AccountName:-$(_readaccountconf_mutable SIMPLY_AccountName)}"
+  SIMPLY_ApiKey="${SIMPLY_ApiKey:-$(_readaccountconf_mutable SIMPLY_ApiKey)}"
+
+  if [ -z "$SIMPLY_Api" ]; then
+    SIMPLY_Api="$SIMPLY_Api_Default"
+  fi
+  
+  if [ -z "$SIMPLY_AccountName" ] || [ -z "$SIMPLY_ApiKey" ]; then
+    SIMPLY_AccountName=""
+    SIMPLY_ApiKey=""
+
+    _err "A valid Simply API account and apikey not provided."
+    _err "Please provide a valid API user and try again."
+
+    return 1
+  fi
+
+  return 0
+}
+
+_simply_save_config() {
+  if [ "$SIMPLY_Api" != "$SIMPLY_Api_Default" ]; then
+    _saveaccountconf_mutable SIMPLY_Api "$SIMPLY_Api"
+  fi
+  _saveaccountconf_mutable SIMPLY_AccountName "$SIMPLY_AccountName"
+  _saveaccountconf_mutable SIMPLY_ApiKey "$SIMPLY_ApiKey"
+}
+
+_simply_get_all_records() {
+  domain=$1  
+      
+  if ! _simply_rest GET "my/products/$domain/dns/records"; then
+    return 1
+  fi
+
+  return 0
+}
+
+_get_root() {
+  domain=$1
+  i=2
+  p=1
+  while true; do
+    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
+    if [ -z "$h" ]; then
+      #not valid
+      return 1
+    fi
+
+    if ! _simply_rest GET "my/products/$h/dns"; then
+      return 1
+    fi
+
+    if _contains "$response" '"code":"NOT_FOUND"'; then
+      _debug "$h not found"
+    else
+      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
+      _domain="$h"
+      return 0
+    fi
+    p="$i"
+    i=$(_math "$i" + 1)
+  done
+  return 1
+}
+
+_simply_add_record() {
+  domain=$1
+  sub_domain=$2
+  txtval=$3
+  
+  data="{\"name\": \"$sub_domain\", \"type\":\"TXT\", \"data\": \"$txtval\", \"priority\":0, \"ttl\": 3600}"
+
+  if ! _simply_rest POST "my/products/$domain/dns/records" "$data"; then
+    _err "Adding record not successfull!"
+    return 1
+  fi
+  
+  return 0
+}
+
+_simply_delete_record() {
+  domain=$1
+  sub_domain=$2
+  record_id=$3
+  
+  _debug "Delete record with id $record_id"
+  
+  if ! _simply_rest DELETE "my/products/$domain/dns/records/$record_id"; then
+    _err "Deleting record not successfull!"
+    return 1
+  fi
+  
+  return 0
+}
+
+_simply_rest() {
+  m=$1
+  ep="$2"
+  data="$3"
+    
+  _debug "Data: $data"
+  _debug "Methodcall: $ep"
+  _debug "Call type: $m"
+
+  export _H1="Content-Type: application/json"
+
+  if [ "$m" != "GET" ]; then
+    response="$(_post "$data" "$SIMPLY_Api/$SIMPLY_AccountName/$SIMPLY_ApiKey/$ep" "" "$m")"
+  else
+    response="$(_get "$SIMPLY_Api/$SIMPLY_AccountName/$SIMPLY_ApiKey/$ep")"
+  fi
+
+  if [ "$?" != "0" ]; then
+    _err "error $ep"
+    return 1
+  fi
+  
+  _debug2 response "$response"
+  
+  if _contains "$response" "Invalid account authorization"; then
+    _err "It seems that your api key or accountnumber is not correct."
+    return 1
+  fi
+  return 0
+}

From 81c496d96c4fe5b4aa4de3e47cc7d40f017af194 Mon Sep 17 00:00:00 2001
From: jakelamotta <kristian.johansson86@gmail.com>
Date: Tue, 17 Nov 2020 13:49:32 +0100
Subject: [PATCH 12/41] Fix comments

---
 dnsapi/dns_simply.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dnsapi/dns_simply.sh b/dnsapi/dns_simply.sh
index 25dd9ff3..3914e1ab 100644
--- a/dnsapi/dns_simply.sh
+++ b/dnsapi/dns_simply.sh
@@ -59,7 +59,7 @@ dns_simply_rm() {
 
   _debug _sub_domain "$_sub_domain"
   _debug _domain "$_domain"
-  _debug "$txtvalue"
+  _debug txtvalue "$txtvalue"
 
   _debug "Getting existing records"
   
@@ -78,9 +78,9 @@ dns_simply_rm() {
   
   if [[ "$record" == *"$txtvalue"* && "$record" == *"TXT"* ]]; then
   
-    _info "Deleting record: $record"
-    
     record_id=`echo $record | cut -d "," -f 1 | grep "record_id" | cut -d ":" -f 2`
+	
+	_info "Deleting record $record"
     
     if [[ $record_id -gt 0 ]]; then
       
@@ -198,7 +198,7 @@ _simply_delete_record() {
   sub_domain=$2
   record_id=$3
   
-  _debug "Delete record with id $record_id"
+  _debug record_id "Delete record with id $record_id"
   
   if ! _simply_rest DELETE "my/products/$domain/dns/records/$record_id"; then
     _err "Deleting record not successfull!"
@@ -213,9 +213,9 @@ _simply_rest() {
   ep="$2"
   data="$3"
     
-  _debug "Data: $data"
-  _debug "Methodcall: $ep"
-  _debug "Call type: $m"
+  _debug2 data "$data"
+  _debug2 ep "$ep"
+  _debug2 m "$m"
 
   export _H1="Content-Type: application/json"
 

From 4284777556d11747015273051f260a60b539e392 Mon Sep 17 00:00:00 2001
From: jakelamotta <kristian.johansson86@gmail.com>
Date: Tue, 17 Nov 2020 14:20:45 +0100
Subject: [PATCH 13/41] Fix indentation and added some debug messages

---
 dnsapi/dns_simply.sh | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/dnsapi/dns_simply.sh b/dnsapi/dns_simply.sh
index 3914e1ab..8fb56585 100644
--- a/dnsapi/dns_simply.sh
+++ b/dnsapi/dns_simply.sh
@@ -61,7 +61,7 @@ dns_simply_rm() {
   _debug _domain "$_domain"
   _debug txtvalue "$txtvalue"
 
-  _debug "Getting existing records"
+  _info "Getting all existing records"
   
   if ! _simply_get_all_records "$_domain"; then
     _err "invalid domain"
@@ -71,31 +71,34 @@ dns_simply_rm() {
   records=$(echo "$response" | tr '{' "\n" | grep 'record_id\|type\|data\|\name' | sed 's/\"record_id/;\"record_id/')
   record_array=(`echo $records |tr -d ' ' | tr ';' ' '`)
   nr_of_deleted_records=0
+  
+  _info "Fetching txt record.."
 
   for (( i=0; i<=${#record_array[@]}; i++ )); do
   
-  record="${record_array[$i]}"
+    record="${record_array[$i]}"
+    _debug record "$record"
   
-  if [[ "$record" == *"$txtvalue"* && "$record" == *"TXT"* ]]; then
+    if [[ "$record" == *"$txtvalue"* && "$record" == *"TXT"* ]]; then
   
-    record_id=`echo $record | cut -d "," -f 1 | grep "record_id" | cut -d ":" -f 2`
+      record_id=`echo $record | cut -d "," -f 1 | grep "record_id" | cut -d ":" -f 2`
 	
-	_info "Deleting record $record"
+	  _info "Deleting record $record"
     
-    if [[ $record_id -gt 0 ]]; then
+      if [[ $record_id -gt 0 ]]; then
       
-      if ! _simply_delete_record "$_domain" "$_sub_domain" "$record_id"; then
-        _err "Record with id $record_id could not be deleted"
-        return 1
+        if ! _simply_delete_record "$_domain" "$_sub_domain" "$record_id"; then
+          _err "Record with id $record_id could not be deleted"
+          return 1
+        fi
+      
+        nr_of_deleted_records=1
+        break
+      else  
+        _err "Fetching record_id could not be done, this should not happen, exiting function. Failing record is $record"
+        break
       fi
-      
-      nr_of_deleted_records=1
-      break
-    else  
-      _err "Fetching record_id could not be done, this should not happen, exiting function. Failing record is $record"
-      break
     fi
-  fi
   
   done
 

From 8e64329d05edf4035460f08aacf244d5f68dbb44 Mon Sep 17 00:00:00 2001
From: jakelamotta <kristian.johansson86@gmail.com>
Date: Wed, 18 Nov 2020 14:52:32 +0100
Subject: [PATCH 14/41] Fix CI-errors

---
 dnsapi/dns_simply.sh | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/dnsapi/dns_simply.sh b/dnsapi/dns_simply.sh
index 8fb56585..9deceb25 100644
--- a/dnsapi/dns_simply.sh
+++ b/dnsapi/dns_simply.sh
@@ -7,7 +7,7 @@
 #
 #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 #####################
 
 #Usage: add  _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
@@ -22,6 +22,7 @@ dns_simply_add() {
   _simply_save_config
 
   _debug "First detect the root zone"
+  
   if ! _get_root "$fulldomain"; then
     _err "invalid domain"
     return 1
@@ -69,23 +70,28 @@ dns_simply_rm() {
   fi
   
   records=$(echo "$response" | tr '{' "\n" | grep 'record_id\|type\|data\|\name' | sed 's/\"record_id/;\"record_id/')
-  record_array=(`echo $records |tr -d ' ' | tr ';' ' '`)
-  nr_of_deleted_records=0
-  
-  _info "Fetching txt record.."
+  record_array=$(echo $records |tr -d ' ' | tr ';' ' ')
 
-  for (( i=0; i<=${#record_array[@]}; i++ )); do
-  
-    record="${record_array[$i]}"
+  nr_of_deleted_records=0
+  _info "Fetching txt record"
+
+  for record in $record_array; do 
     _debug record "$record"
+	
+	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)
+    
+	_debug2 record_data "$record_data"
+	_debug2 record_type "$record_type"
+	
+    if [ "$record_data" = "$txtvalue" ] && [ "$record_type" = "TXT" ]; then
   
-    if [[ "$record" == *"$txtvalue"* && "$record" == *"TXT"* ]]; then
-  
-      record_id=`echo $record | cut -d "," -f 1 | grep "record_id" | cut -d ":" -f 2`
+      record_id=$(echo $record | cut -d "," -f 1 | grep "record_id" | cut -d ":" -f 2)
 	
 	  _info "Deleting record $record"
-    
-      if [[ $record_id -gt 0 ]]; then
+      _debug2 record_id "$record_id"
+	  
+      if [ "$record_id" -gt 0 ]; then
       
         if ! _simply_delete_record "$_domain" "$_sub_domain" "$record_id"; then
           _err "Record with id $record_id could not be deleted"
@@ -102,7 +108,7 @@ dns_simply_rm() {
   
   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." 
   else
     _info "Deleted $nr_of_deleted_records record"

From 449f00f9606268112c215450ef233bc051767db1 Mon Sep 17 00:00:00 2001
From: jakelamotta <kristian.johansson86@gmail.com>
Date: Wed, 18 Nov 2020 15:12:22 +0100
Subject: [PATCH 15/41] Add double quotes to variables

---
 dnsapi/dns_simply.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/dnsapi/dns_simply.sh b/dnsapi/dns_simply.sh
index 9deceb25..30211f7a 100644
--- a/dnsapi/dns_simply.sh
+++ b/dnsapi/dns_simply.sh
@@ -69,26 +69,25 @@ dns_simply_rm() {
     return 1
   fi
   
-  records=$(echo "$response" | tr '{' "\n" | grep 'record_id\|type\|data\|\name' | sed 's/\"record_id/;\"record_id/')
-  record_array=$(echo $records |tr -d ' ' | tr ';' ' ')
+  records=$(echo "$response" | tr '{' "\n" | grep 'record_id\|type\|data\|\name' | sed 's/\"record_id/;\"record_id/' | tr "\n" ' '| tr -d ' ' | tr ';' ' ')
 
   nr_of_deleted_records=0
   _info "Fetching txt record"
 
-  for record in $record_array; do 
+  for record in $records; do 
     _debug record "$record"
 	
-	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_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)
     
 	_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)
+      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

From 9ad05e640d83ae368ff690c14306e0cad085c338 Mon Sep 17 00:00:00 2001
From: jakelamotta <kristian.johansson86@gmail.com>
Date: Wed, 18 Nov 2020 15:37:26 +0100
Subject: [PATCH 16/41] Removed spaces on empty lines

---
 dnsapi/dns_simply.sh | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/dnsapi/dns_simply.sh b/dnsapi/dns_simply.sh
index 30211f7a..6f2464ef 100644
--- a/dnsapi/dns_simply.sh
+++ b/dnsapi/dns_simply.sh
@@ -21,8 +21,7 @@ dns_simply_add() {
 
   _simply_save_config
 
-  _debug "First detect the root zone"
-  
+  _debug "First detect the root zone"  
   if ! _get_root "$fulldomain"; then
     _err "invalid domain"
     return 1
@@ -36,8 +35,7 @@ dns_simply_add() {
   if ! _simply_add_record "$_domain" "$_sub_domain" "$txtvalue"; then  
     _err "Could not add DNS record"
     return 1
-  fi
-  
+  fi  
   return 0
 }
 
@@ -126,7 +124,7 @@ _simply_load_config() {
   if [ -z "$SIMPLY_Api" ]; then
     SIMPLY_Api="$SIMPLY_Api_Default"
   fi
-  
+
   if [ -z "$SIMPLY_AccountName" ] || [ -z "$SIMPLY_ApiKey" ]; then
     SIMPLY_AccountName=""
     SIMPLY_ApiKey=""
@@ -149,8 +147,8 @@ _simply_save_config() {
 }
 
 _simply_get_all_records() {
-  domain=$1  
-      
+  domain=$1
+
   if ! _simply_rest GET "my/products/$domain/dns/records"; then
     return 1
   fi
@@ -190,14 +188,14 @@ _simply_add_record() {
   domain=$1
   sub_domain=$2
   txtval=$3
-  
+
   data="{\"name\": \"$sub_domain\", \"type\":\"TXT\", \"data\": \"$txtval\", \"priority\":0, \"ttl\": 3600}"
 
   if ! _simply_rest POST "my/products/$domain/dns/records" "$data"; then
     _err "Adding record not successfull!"
     return 1
   fi
-  
+
   return 0
 }
 
@@ -205,14 +203,14 @@ _simply_delete_record() {
   domain=$1
   sub_domain=$2
   record_id=$3
-  
+
   _debug record_id "Delete record with id $record_id"
-  
+
   if ! _simply_rest DELETE "my/products/$domain/dns/records/$record_id"; then
     _err "Deleting record not successfull!"
     return 1
   fi
-  
+
   return 0
 }
 
@@ -220,7 +218,7 @@ _simply_rest() {
   m=$1
   ep="$2"
   data="$3"
-    
+
   _debug2 data "$data"
   _debug2 ep "$ep"
   _debug2 m "$m"
@@ -237,12 +235,13 @@ _simply_rest() {
     _err "error $ep"
     return 1
   fi
-  
+
   _debug2 response "$response"
-  
+
   if _contains "$response" "Invalid account authorization"; then
     _err "It seems that your api key or accountnumber is not correct."
     return 1
   fi
+  
   return 0
 }

From fcb97f802f8c19852bb56216716d17395f4441cf Mon Sep 17 00:00:00 2001
From: jakelamotta <kristian.johansson86@gmail.com>
Date: Wed, 18 Nov 2020 15:46:16 +0100
Subject: [PATCH 17/41] Removes tabs and trailing spaces

---
 dnsapi/dns_simply.sh | 45 ++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/dnsapi/dns_simply.sh b/dnsapi/dns_simply.sh
index 6f2464ef..bf383019 100644
--- a/dnsapi/dns_simply.sh
+++ b/dnsapi/dns_simply.sh
@@ -21,28 +21,29 @@ dns_simply_add() {
 
   _simply_save_config
 
-  _debug "First detect the root zone"  
+  _debug "First detect the root zone"
+
   if ! _get_root "$fulldomain"; then
     _err "invalid domain"
     return 1
   fi
-  
+
   _debug _sub_domain "$_sub_domain"
   _debug _domain "$_domain"
 
   _info "Adding record"
 
-  if ! _simply_add_record "$_domain" "$_sub_domain" "$txtvalue"; then  
+  if ! _simply_add_record "$_domain" "$_sub_domain" "$txtvalue"; then
     _err "Could not add DNS record"
     return 1
-  fi  
+  fi
   return 0
 }
 
 dns_simply_rm() {
   fulldomain=$1
   txtvalue=$2
-  
+
   if ! _simply_load_config; then
     return 1
   fi
@@ -61,12 +62,12 @@ dns_simply_rm() {
   _debug txtvalue "$txtvalue"
 
   _info "Getting all existing records"
-  
+
   if ! _simply_get_all_records "$_domain"; then
     _err "invalid domain"
     return 1
   fi
-  
+
   records=$(echo "$response" | tr '{' "\n" | grep 'record_id\|type\|data\|\name' | sed 's/\"record_id/;\"record_id/' | tr "\n" ' '| tr -d ' ' | tr ';' ' ')
 
   nr_of_deleted_records=0
@@ -74,27 +75,27 @@ dns_simply_rm() {
 
   for record in $records; do 
     _debug record "$record"
-	
-	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)
-    
-	_debug2 record_data "$record_data"
-	_debug2 record_type "$record_type"
-	
-    if [ "$record_data" = "$txtvalue" ] && [ "$record_type" = "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)
+
+  _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"
       _debug2 record_id "$record_id"
-	  
+
       if [ "$record_id" -gt 0 ]; then
-      
+
         if ! _simply_delete_record "$_domain" "$_sub_domain" "$record_id"; then
           _err "Record with id $record_id could not be deleted"
           return 1
         fi
-      
+
         nr_of_deleted_records=1
         break
       else  
@@ -102,7 +103,7 @@ dns_simply_rm() {
         break
       fi
     fi
-  
+
   done
 
   if [ "$nr_of_deleted_records" -eq 0 ]; then
@@ -110,7 +111,7 @@ dns_simply_rm() {
   else
     _info "Deleted $nr_of_deleted_records record"
   fi
-  
+
   return 0
 }
 
@@ -242,6 +243,6 @@ _simply_rest() {
     _err "It seems that your api key or accountnumber is not correct."
     return 1
   fi
-  
+
   return 0
 }

From 29d0a1714e3d7a33e55617c1f11573b2a44eafef Mon Sep 17 00:00:00 2001
From: jakelamotta <kristian.johansson86@gmail.com>
Date: Wed, 18 Nov 2020 15:52:46 +0100
Subject: [PATCH 18/41] Fix code style problems

---
 dnsapi/dns_simply.sh | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/dnsapi/dns_simply.sh b/dnsapi/dns_simply.sh
index bf383019..379f1b42 100644
--- a/dnsapi/dns_simply.sh
+++ b/dnsapi/dns_simply.sh
@@ -22,7 +22,6 @@ dns_simply_add() {
   _simply_save_config
 
   _debug "First detect the root zone"
-
   if ! _get_root "$fulldomain"; then
     _err "invalid domain"
     return 1
@@ -68,19 +67,19 @@ dns_simply_rm() {
     return 1
   fi
 
-  records=$(echo "$response" | tr '{' "\n" | grep 'record_id\|type\|data\|\name' | sed 's/\"record_id/;\"record_id/' | tr "\n" ' '| tr -d ' ' | tr ';' ' ')
+  records=$(echo "$response" | tr '{' "\n" | grep 'record_id\|type\|data\|\name' | sed 's/\"record_id/;\"record_id/' | tr "\n" ' ' | tr -d ' ' | tr ';' ' ')
 
   nr_of_deleted_records=0
   _info "Fetching txt record"
 
-  for record in $records; do 
+  for record in $records; do
     _debug record "$record"
-  
-  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)
 
-  _debug2 record_data "$record_data"
-  _debug2 record_type "$record_type"
+    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)
+
+    _debug2 record_data "$record_data"
+    _debug2 record_type "$record_type"
   
     if [ "$record_data" = "$txtvalue" ] && [ "$record_type" = "TXT" ]; then
 
@@ -98,7 +97,7 @@ dns_simply_rm() {
 
         nr_of_deleted_records=1
         break
-      else  
+      else
         _err "Fetching record_id could not be done, this should not happen, exiting function. Failing record is $record"
         break
       fi
@@ -107,7 +106,7 @@ dns_simply_rm() {
   done
 
   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
     _info "Deleted $nr_of_deleted_records record"
   fi

From 30f359e6427f289c0181375f4f2b9300c1e27a09 Mon Sep 17 00:00:00 2001
From: jakelamotta <kristian.johansson86@gmail.com>
Date: Wed, 18 Nov 2020 15:55:02 +0100
Subject: [PATCH 19/41] Fix code style problems

---
 dnsapi/dns_simply.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dnsapi/dns_simply.sh b/dnsapi/dns_simply.sh
index 379f1b42..9a9133e6 100644
--- a/dnsapi/dns_simply.sh
+++ b/dnsapi/dns_simply.sh
@@ -50,7 +50,7 @@ dns_simply_rm() {
   _simply_save_config
 
   _debug "First detect the root zone"
-  
+
   if ! _get_root "$fulldomain"; then
     _err "invalid domain"
     return 1
@@ -80,7 +80,7 @@ dns_simply_rm() {
 
     _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)

From 69bdbaed410c8bb38ed5a67f031b30e8420ab6bc Mon Sep 17 00:00:00 2001
From: jakelamotta <kristian.johansson86@gmail.com>
Date: Wed, 18 Nov 2020 18:01:02 +0100
Subject: [PATCH 20/41] Fix comment

---
 dnsapi/dns_simply.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dnsapi/dns_simply.sh b/dnsapi/dns_simply.sh
index 9a9133e6..d053dcf6 100644
--- a/dnsapi/dns_simply.sh
+++ b/dnsapi/dns_simply.sh
@@ -8,8 +8,8 @@
 #SIMPLY_Api="https://api.simply.com/1/[ACCOUNTNAME]/[APIKEY]"
 
 SIMPLY_Api_Default="https://api.simply.com/1"
-########  Public functions #####################
 
+########  Public functions #####################
 #Usage: add  _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
 dns_simply_add() {
   fulldomain=$1

From 2bc627970ed38fbccd7316e7e4a868eb33cff94c Mon Sep 17 00:00:00 2001
From: Christian Burmeister <christianbur@users.noreply.github.com>
Date: Tue, 1 Dec 2020 20:30:56 +0100
Subject: [PATCH 21/41] Update mailcow.sh

I have modified the following things:

    Originally, "/data/assets/ssl/" is always appended to the varialbe ${_mailcow_path}. Since I use acme.sh as docker container, I only want to include the mailcow-ssl directory in the acem.sh container and not the complete mailcow directory. So now it is checked if the file generate_config.sh is in the directory (then it is the mailcow root directory, see https://github.com/mailcow/mailcow-dockerized) and only then "/data/assets/ssl/" is appended, in all other cases the passed variable is taken over unchanged.

    Because of the RP mailcow/mailcow-dockerized#2443 I have extended the script with ECC certificates.

    I adapted the reboot commands as described in the mailcow manual (https://mailcow.github.io/mailcow-dockerized-docs/firststeps-ssl/#how-to-use-your-own-certificate).
---
 deploy/mailcow.sh | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/deploy/mailcow.sh b/deploy/mailcow.sh
index 3a806e83..830bec04 100644
--- a/deploy/mailcow.sh
+++ b/deploy/mailcow.sh
@@ -27,26 +27,46 @@ mailcow_deploy() {
     return 1
   fi
 
-  _ssl_path="${_mailcow_path}/data/assets/ssl/"
+  #Tests if _ssl_path is the mailcow root directory. 
+  if [ -f "${_mailcow_path}/generate_config.sh" ]; then
+    _ssl_path="${_mailcow_path}/data/assets/ssl/"
+  else
+   _ssl_path="${_mailcow_path}"
+  fi
+
   if [ ! -d "$_ssl_path" ]; then
     _err "Cannot find mailcow ssl path: $_ssl_path"
     return 1
   fi
 
+  # ECC or RSA
+  if [ -z "${Le_Keylength}" ]; then
+      Le_Keylength=""
+  fi
+  if _isEccKey "${Le_Keylength}"; then
+     _info "ECC key type detected"
+     _cert_type="ecdsa"
+     _cert_name_prefix="ecdsa-"
+  else
+     _info "RSA key type detected"
+     _cert_type="rsa"
+     _cert_name_prefix=""
+
+  fi
   _info "Copying key and cert"
-  _real_key="$_ssl_path/key.pem"
+  _real_key="$_ssl_path/${_cert_name_prefix}key.pem"
   if ! cat "$_ckey" >"$_real_key"; then
     _err "Error: write key file to: $_real_key"
     return 1
   fi
 
-  _real_fullchain="$_ssl_path/cert.pem"
+  _real_fullchain="$_ssl_path/${_cert_name_prefix}cert.pem"
   if ! cat "$_cfullchain" >"$_real_fullchain"; then
     _err "Error: write cert file to: $_real_fullchain"
     return 1
   fi
 
-  DEFAULT_MAILCOW_RELOAD="cd ${_mailcow_path} && docker-compose restart postfix-mailcow dovecot-mailcow nginx-mailcow"
+  DEFAULT_MAILCOW_RELOAD="docker restart $(docker ps -qaf name=postfix-mailcow); docker restart $(docker ps -qaf name=nginx-mailcow); docker restart $(docker ps -qaf name=dovecot-mailcow)"
   _reload="${DEPLOY_MAILCOW_RELOAD:-$DEFAULT_MAILCOW_RELOAD}"
 
   _info "Run reload: $_reload"

From 94bba4ac9c977194209b3829bc83f4b3b783aa9f Mon Sep 17 00:00:00 2001
From: Nate <nate1010smith@users.noreply.github.com>
Date: Sun, 6 Dec 2020 22:45:42 +0700
Subject: [PATCH 22/41] Correct sed regex

Corrects issue #3285.

The '?' character after a group is not supported in POSIX Basic Regular Expressions. Replacing it with '\{0,1\}' retains the same functionality and also works on non-GNU systems.
---
 dnsapi/dns_duckdns.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dnsapi/dns_duckdns.sh b/dnsapi/dns_duckdns.sh
index f0af2741..41685147 100755
--- a/dnsapi/dns_duckdns.sh
+++ b/dnsapi/dns_duckdns.sh
@@ -96,7 +96,7 @@ dns_duckdns_rm() {
 _duckdns_get_domain() {
 
   # We'll extract the domain/username from full domain
-  _duckdns_domain="$(printf "%s" "$fulldomain" | _lower_case | _egrep_o '^(_acme-challenge\.)?[a-z0-9-]*\.duckdns\.org' | sed 's/^\(_acme-challenge\.\)\?\([a-z0-9-]*\)\.duckdns\.org/\2/')"
+  _duckdns_domain="$(printf "%s" "$fulldomain" | _lower_case | _egrep_o '^(_acme-challenge\.)?[a-z0-9-]*\.duckdns\.org' | sed 's/^\(_acme-challenge\.\)\{0,1\}\([a-z0-9-]*\)\.duckdns\.org/\2/')"
 
   if [ -z "$_duckdns_domain" ]; then
     _err "Error extracting the domain."

From 671bd1022e92009873e596ab341d1cd3b1ec1c24 Mon Sep 17 00:00:00 2001
From: Van Hau TRAN <vanonox@gmail.com>
Date: Sun, 6 Dec 2020 22:59:36 +0100
Subject: [PATCH 23/41] feat: add scaleway provider

---
 dnsapi/dns_scaleway.sh | 162 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 162 insertions(+)
 create mode 100755 dnsapi/dns_scaleway.sh

diff --git a/dnsapi/dns_scaleway.sh b/dnsapi/dns_scaleway.sh
new file mode 100755
index 00000000..20397096
--- /dev/null
+++ b/dnsapi/dns_scaleway.sh
@@ -0,0 +1,162 @@
+#!/usr/bin/env sh
+
+# Scaleway API
+# https://developers.scaleway.com/en/products/domain/dns/api/
+#
+# Requires Scaleway API token set in SCALEWAY_API_TOKEN
+
+########  Public functions #####################
+
+SCALEWAY_API="https://api.scaleway.com/domain/v2beta1"
+
+#Usage: add  _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
+dns_scaleway_add() {
+  fulldomain=$1
+  txtvalue=$2
+
+  if ! _scaleway_check_config; then
+    return 1
+  fi
+
+  _debug "First detect the root zone"
+  if ! _get_root "$fulldomain"; then
+    _err "invalid domain"
+    return 1
+  fi
+
+  _debug _sub_domain "$_sub_domain"
+  _debug _domain "$_domain"
+
+  _info "Adding record"
+  _scaleway_create_TXT_record "$_domain" "$_sub_domain" "$txtvalue"
+  _info "Record added."
+
+  return 0
+}
+
+dns_scaleway_rm() {
+  fulldomain=$1
+  txtvalue=$2
+
+  if ! _scaleway_check_config; then
+    return 1
+  fi
+
+  _debug "First detect the root zone"
+  if ! _get_root "$fulldomain"; then
+    _err "invalid domain"
+    return 1
+  fi
+
+  _debug _sub_domain "$_sub_domain"
+  _debug _domain "$_domain"
+
+  _info "Deleting record"
+  _scaleway_create_TXT_record "$_domain" "$_sub_domain" "$txtvalue"
+  _info "Record deleted."
+
+  return 0
+}
+
+####################  Private functions below ##################################
+
+_scaleway_check_config() {
+  SCALEWAY_API_TOKEN="${SCALEWAY_API_TOKEN:-$(_readaccountconf_mutable SCALEWAY_API_TOKEN)}"
+  if [ -z "$SCALEWAY_API_TOKEN" ]; then
+    _err "No API key specified for Scaleway API."
+    _err "Create your key and export it as SCALEWAY_API_TOKEN"
+    return 1
+  fi
+  if ! _scaleway_rest GET "dns-zones"; then
+    _err "Invalid API key specified for Scaleway API."
+    return 1
+  fi
+
+  _saveaccountconf_mutable SCALEWAY_API_TOKEN "$SCALEWAY_API_TOKEN"
+
+  return 0
+}
+
+#_acme-challenge.www.domain.com
+#returns
+# _sub_domain=_acme-challenge.www
+# _domain=domain.com
+_get_root() {
+  domain=$1
+  i=2
+  p=1
+  while true; do
+    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
+    if [ -z "$h" ]; then
+      #not valid
+      return 1
+    fi
+
+    _scaleway_rest GET "dns-zones/$h/records"
+
+    if ! _contains "$response" "subdomain not found" >/dev/null; then
+      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
+      _domain="$h"
+      return 0
+    fi
+    p=$i
+    i=$(_math "$i" + 1)
+  done
+  _err "Unable to retrive DNS zone matching this domain"
+  return 1
+}
+
+_scaleway_create_TXT_record() {
+  txt_zone=$1
+  txt_name=$2
+  txt_value=$3
+
+  _scaleway_rest PATCH "dns-zones/$txt_zone/records" "{\"return_all_records\":false,\"changes\":[{\"add\":{\"records\":[{\"name\":\"$txt_name\",\"data\":\"$txt_value\",\"type\":\"TXT\",\"ttl\":60}]}}]}"
+
+  if [ _contains "$response" "records"; then
+    return 0
+  else
+    _err "error1 $response"
+    return 1
+  fi
+}
+
+_scaleway_delete_TXT_record() {
+  txt_zone=$1
+  txt_name=$2
+  txt_value=$3
+
+  _scaleway_rest PATCH "dns-zones/$txt_zone/records" "{\"return_all_records\":false,\"changes\":[{\"delete\":{\"id_fields\":{\"name\":\"$txt_name\",\"data\":\"$txt_value\",\"type\":\"TXT\"}}}]}"
+
+  if [ _contains "$response" "records"; then
+    return 0
+  else
+    _err "error2 $response"
+    return 1
+  fi
+}
+
+_scaleway_rest() {
+  m=$1
+  ep="$2"
+  data="$3"
+  _debug "$ep"
+  _scaleway_url="$SCALEWAY_API/$ep"
+  _debug2 _scaleway_url "$_scaleway_url"
+  export _H1="x-auth-token: $SCALEWAY_API_TOKEN"
+  export _H2="Accept: application/json"
+  export _H3="Content-Type: application/json"
+
+  if [ "$data" ] || [ "$m" != "GET" ]; then
+    _debug data "$data"
+    response="$(_post "$data" "$_scaleway_url" "" "$m")"
+  else
+    response="$(_get "$_scaleway_url")"
+  fi
+  if [ "$?" != "0" ] || _contains "$response" "denied_authentication" || _contains "$response" "Method not allowed" || _contains "$response" "json parse error: unexpected EOF"; then
+    _err "error $response"
+    return 1
+  fi
+  _debug2 response "$response"
+  return 0
+}

From b5653a1c06e93f745e716a8860897b15a481affc Mon Sep 17 00:00:00 2001
From: Van Hau TRAN <vanonox@gmail.com>
Date: Sun, 6 Dec 2020 23:14:25 +0100
Subject: [PATCH 24/41] feat: add comment and configure workflow ci test

---
 dnsapi/dns_scaleway.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dnsapi/dns_scaleway.sh b/dnsapi/dns_scaleway.sh
index 20397096..abca5125 100755
--- a/dnsapi/dns_scaleway.sh
+++ b/dnsapi/dns_scaleway.sh
@@ -106,6 +106,7 @@ _get_root() {
   return 1
 }
 
+# this function add a TXT record
 _scaleway_create_TXT_record() {
   txt_zone=$1
   txt_name=$2
@@ -121,6 +122,7 @@ _scaleway_create_TXT_record() {
   fi
 }
 
+# this function delete a TXT record based on name and content
 _scaleway_delete_TXT_record() {
   txt_zone=$1
   txt_name=$2

From 5127a9ae3cbc611047a42d041b8e5da50906d1da Mon Sep 17 00:00:00 2001
From: Van Hau TRAN <vanonox@gmail.com>
Date: Sun, 6 Dec 2020 23:20:41 +0100
Subject: [PATCH 25/41] fix: shell if

---
 dnsapi/dns_scaleway.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dnsapi/dns_scaleway.sh b/dnsapi/dns_scaleway.sh
index abca5125..778738f4 100755
--- a/dnsapi/dns_scaleway.sh
+++ b/dnsapi/dns_scaleway.sh
@@ -114,7 +114,7 @@ _scaleway_create_TXT_record() {
 
   _scaleway_rest PATCH "dns-zones/$txt_zone/records" "{\"return_all_records\":false,\"changes\":[{\"add\":{\"records\":[{\"name\":\"$txt_name\",\"data\":\"$txt_value\",\"type\":\"TXT\",\"ttl\":60}]}}]}"
 
-  if [ _contains "$response" "records"; then
+  if _contains "$response" "records"; then
     return 0
   else
     _err "error1 $response"
@@ -130,7 +130,7 @@ _scaleway_delete_TXT_record() {
 
   _scaleway_rest PATCH "dns-zones/$txt_zone/records" "{\"return_all_records\":false,\"changes\":[{\"delete\":{\"id_fields\":{\"name\":\"$txt_name\",\"data\":\"$txt_value\",\"type\":\"TXT\"}}}]}"
 
-  if [ _contains "$response" "records"; then
+  if _contains "$response" "records"; then
     return 0
   else
     _err "error2 $response"

From a0c2d312e9e1698076bbacf010c37d933427c2f0 Mon Sep 17 00:00:00 2001
From: neil <win10@neilpang.com>
Date: Mon, 7 Dec 2020 21:31:02 +0800
Subject: [PATCH 26/41] start 2.8.9

---
 acme.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/acme.sh b/acme.sh
index dcbe3c9d..ae387535 100755
--- a/acme.sh
+++ b/acme.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-VER=2.8.8
+VER=2.8.9
 
 PROJECT_NAME="acme.sh"
 

From 32b62d6d4f3424b0212ce1bf196c04353a23c838 Mon Sep 17 00:00:00 2001
From: neil <win10@neilpang.com>
Date: Mon, 7 Dec 2020 21:41:08 +0800
Subject: [PATCH 27/41] fix

---
 deploy/mailcow.sh | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/deploy/mailcow.sh b/deploy/mailcow.sh
index 830bec04..babd5d28 100644
--- a/deploy/mailcow.sh
+++ b/deploy/mailcow.sh
@@ -27,11 +27,11 @@ mailcow_deploy() {
     return 1
   fi
 
-  #Tests if _ssl_path is the mailcow root directory. 
+  #Tests if _ssl_path is the mailcow root directory.
   if [ -f "${_mailcow_path}/generate_config.sh" ]; then
     _ssl_path="${_mailcow_path}/data/assets/ssl/"
   else
-   _ssl_path="${_mailcow_path}"
+    _ssl_path="${_mailcow_path}"
   fi
 
   if [ ! -d "$_ssl_path" ]; then
@@ -41,17 +41,16 @@ mailcow_deploy() {
 
   # ECC or RSA
   if [ -z "${Le_Keylength}" ]; then
-      Le_Keylength=""
+    Le_Keylength=""
   fi
   if _isEccKey "${Le_Keylength}"; then
-     _info "ECC key type detected"
-     _cert_type="ecdsa"
-     _cert_name_prefix="ecdsa-"
+    _info "ECC key type detected"
+    _cert_type="ecdsa"
+    _cert_name_prefix="ecdsa-"
   else
-     _info "RSA key type detected"
-     _cert_type="rsa"
-     _cert_name_prefix=""
-
+    _info "RSA key type detected"
+    _cert_type="rsa"
+    _cert_name_prefix=""
   fi
   _info "Copying key and cert"
   _real_key="$_ssl_path/${_cert_name_prefix}key.pem"

From 174c87a192cb86749d83697a347624f33797e874 Mon Sep 17 00:00:00 2001
From: neil <win10@neilpang.com>
Date: Mon, 7 Dec 2020 21:42:31 +0800
Subject: [PATCH 28/41] fix

---
 deploy/mailcow.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/deploy/mailcow.sh b/deploy/mailcow.sh
index babd5d28..932956c0 100644
--- a/deploy/mailcow.sh
+++ b/deploy/mailcow.sh
@@ -49,7 +49,6 @@ mailcow_deploy() {
     _cert_name_prefix="ecdsa-"
   else
     _info "RSA key type detected"
-    _cert_type="rsa"
     _cert_name_prefix=""
   fi
   _info "Copying key and cert"

From 8440d013f8cfd678c3a03677b949e18459920827 Mon Sep 17 00:00:00 2001
From: neil <win10@neilpang.com>
Date: Mon, 7 Dec 2020 22:01:30 +0800
Subject: [PATCH 29/41] fix

---
 deploy/mailcow.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/deploy/mailcow.sh b/deploy/mailcow.sh
index 932956c0..c3535e7e 100644
--- a/deploy/mailcow.sh
+++ b/deploy/mailcow.sh
@@ -45,7 +45,6 @@ mailcow_deploy() {
   fi
   if _isEccKey "${Le_Keylength}"; then
     _info "ECC key type detected"
-    _cert_type="ecdsa"
     _cert_name_prefix="ecdsa-"
   else
     _info "RSA key type detected"

From 9b532584d6f3e33bf4c548f2f035799779a2c895 Mon Sep 17 00:00:00 2001
From: Van Hau TRAN <vanonox@gmail.com>
Date: Tue, 8 Dec 2020 16:32:31 +0100
Subject: [PATCH 30/41] fix: fix delete txt record and error mngtt

---
 dnsapi/dns_scaleway.sh | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/dnsapi/dns_scaleway.sh b/dnsapi/dns_scaleway.sh
index 778738f4..a0a0f318 100755
--- a/dnsapi/dns_scaleway.sh
+++ b/dnsapi/dns_scaleway.sh
@@ -29,6 +29,12 @@ dns_scaleway_add() {
 
   _info "Adding record"
   _scaleway_create_TXT_record "$_domain" "$_sub_domain" "$txtvalue"
+  if _contains "$response" "records"; then
+    return 0
+  else
+    _err error "$response"
+    return 1
+  fi
   _info "Record added."
 
   return 0
@@ -52,7 +58,13 @@ dns_scaleway_rm() {
   _debug _domain "$_domain"
 
   _info "Deleting record"
-  _scaleway_create_TXT_record "$_domain" "$_sub_domain" "$txtvalue"
+  _scaleway_delete_TXT_record "$_domain" "$_sub_domain" "$txtvalue"
+  if _contains "$response" "records"; then
+    return 0
+  else
+    _err error "$response"
+    return 1
+  fi
   _info "Record deleted."
 
   return 0
@@ -83,7 +95,7 @@ _scaleway_check_config() {
 # _domain=domain.com
 _get_root() {
   domain=$1
-  i=2
+  i=1
   p=1
   while true; do
     h=$(printf "%s" "$domain" | cut -d . -f $i-100)

From 99d3a283efd9a6a6a5c6e5812aa829984cbb8cff Mon Sep 17 00:00:00 2001
From: Brian Hartvigsen <brian.andrew@brianandjenny.com>
Date: Sat, 26 Sep 2020 19:38:18 -0600
Subject: [PATCH 31/41] Use POST for login

This allows us to get the cookie and the token (as it appears to be only in the body in DSM 7.)  HTTP_HEADERS is only guarenteed to be output with POST for both wget and curl.
---
 deploy/synology_dsm.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/deploy/synology_dsm.sh b/deploy/synology_dsm.sh
index 2ec0ceb3..53ab5dd9 100644
--- a/deploy/synology_dsm.sh
+++ b/deploy/synology_dsm.sh
@@ -22,7 +22,7 @@
 ########  Public functions #####################
 
 _syno_get_cookie_data() {
-  grep -i "\W$1=" | grep -i "^Set-Cookie:" | _tail_n 1 | _egrep_o "$1=[^;]*;" | tr -d ';'
+  grep -i "\W$1=" "$HTTP_HEADER" | grep -i "^Set-Cookie:" | _tail_n 1 | _egrep_o "$1=[^;]*;" | tr -d ';'
 }
 
 #domain keyfile certfile cafile fullchain
@@ -78,8 +78,8 @@ synology_dsm_deploy() {
   encoded_username="$(printf "%s" "$SYNO_Username" | _url_encode)"
   encoded_password="$(printf "%s" "$SYNO_Password" | _url_encode)"
   encoded_did="$(printf "%s" "$SYNO_DID" | _url_encode)"
-  response=$(_get "$_base_url/webman/login.cgi?username=$encoded_username&passwd=$encoded_password&enable_syno_token=yes&device_id=$encoded_did" 1)
-  token=$(echo "$response" | grep -i "X-SYNO-TOKEN:" | sed -n 's/^X-SYNO-TOKEN: \(.*\)$/\1/pI' | tr -d "\r\n")
+  response=$(_post "username=$encoded_username&passwd=$encoded_password&device_id=$encoded_did" "$_base_url/webman/login.cgi?enable_syno_token=yes")
+  token=$(echo "$response" | grep "SynoToken" | sed -n 's/.*"SynoToken" *: *"\([^"]*\).*/\1/p')
   _debug3 response "$response"
   _debug token "$token"
 
@@ -89,7 +89,7 @@ synology_dsm_deploy() {
     return 1
   fi
 
-  _H1="Cookie: $(echo "$response" | _syno_get_cookie_data "id"); $(echo "$response" | _syno_get_cookie_data "smid")"
+  _H1="Cookie: $(_syno_get_cookie_data "id"); $(_syno_get_cookie_data "smid")"
   _H2="X-SYNO-TOKEN: $token"
   export _H1
   export _H2

From cc69285420a49f118acb37c77e3c8f9f73c19f7f Mon Sep 17 00:00:00 2001
From: Thijn <thijn38@gmail.com>
Date: Wed, 9 Dec 2020 11:45:25 +0100
Subject: [PATCH 32/41] Fix synology_dsm deployhook for DSM 7

---
 deploy/synology_dsm.sh | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/deploy/synology_dsm.sh b/deploy/synology_dsm.sh
index 53ab5dd9..bca12d8d 100644
--- a/deploy/synology_dsm.sh
+++ b/deploy/synology_dsm.sh
@@ -73,13 +73,25 @@ synology_dsm_deploy() {
   _base_url="$SYNO_Scheme://$SYNO_Hostname:$SYNO_Port"
   _debug _base_url "$_base_url"
 
+  _debug "Getting API version"
+  response=$(_get "$_base_url/webapi/query.cgi?api=SYNO.API.Info&version=1&method=query&query=SYNO.API.Auth")
+  api_version=$(echo "$response" | grep "SYNO.API.Auth" | sed -n 's/.*"maxVersion" *: *\([0-9]*\).*/\1/p')
+  _debug3 response "$response"
+  _debug3 api_version "$api_version"
+
   # Login, get the token from JSON and session id from cookie
   _info "Logging into $SYNO_Hostname:$SYNO_Port"
   encoded_username="$(printf "%s" "$SYNO_Username" | _url_encode)"
   encoded_password="$(printf "%s" "$SYNO_Password" | _url_encode)"
-  encoded_did="$(printf "%s" "$SYNO_DID" | _url_encode)"
-  response=$(_post "username=$encoded_username&passwd=$encoded_password&device_id=$encoded_did" "$_base_url/webman/login.cgi?enable_syno_token=yes")
-  token=$(echo "$response" | grep "SynoToken" | sed -n 's/.*"SynoToken" *: *"\([^"]*\).*/\1/p')
+
+  if [ ! -z "$SYNO_DID" ]; then
+    _H1="Cookie: did=$SYNO_DID"
+    export _H1
+    _debug3 H1 "${_H1}"
+  fi
+
+  response=$(_post "method=login&account=$encoded_username&passwd=$encoded_password&enable_device_token=yes&enable_syno_token=yes" "$_base_url/webapi/entry.cgi?api=SYNO.API.Auth&version=$api_version")
+  token=$(echo "$response" | grep "synotoken" | sed -n 's/.*"synotoken" *: *"\([^"]*\).*/\1/p')
   _debug3 response "$response"
   _debug token "$token"
 
@@ -88,13 +100,11 @@ synology_dsm_deploy() {
     _err "Check your username and password."
     return 1
   fi
+  sid=$(echo "$response" | grep "sid" | sed -n 's/.*"sid" *: *"\([^"]*\).*/\1/p')
 
-  _H1="Cookie: $(_syno_get_cookie_data "id"); $(_syno_get_cookie_data "smid")"
-  _H2="X-SYNO-TOKEN: $token"
+  _H1="X-SYNO-TOKEN: $token"
   export _H1
-  export _H2
   _debug2 H1 "${_H1}"
-  _debug2 H2 "${_H2}"
 
   # Now that we know the username and password are good, save them
   _savedeployconf SYNO_Username "$SYNO_Username"
@@ -102,7 +112,7 @@ synology_dsm_deploy() {
   _savedeployconf SYNO_DID "$SYNO_DID"
 
   _info "Getting certificates in Synology DSM"
-  response=$(_post "api=SYNO.Core.Certificate.CRT&method=list&version=1" "$_base_url/webapi/entry.cgi")
+  response=$(_post "api=SYNO.Core.Certificate.CRT&method=list&version=1&_sid=$sid" "$_base_url/webapi/entry.cgi")
   _debug3 response "$response"
   id=$(echo "$response" | sed -n "s/.*\"desc\":\"$SYNO_Certificate\",\"id\":\"\([^\"]*\).*/\1/p")
   _debug2 id "$id"
@@ -135,7 +145,7 @@ synology_dsm_deploy() {
   content="${content%_}" # protect trailing \n
 
   _info "Upload certificate to the Synology DSM"
-  response=$(_post "$content" "$_base_url/webapi/entry.cgi?api=SYNO.Core.Certificate&method=import&version=1&SynoToken=$token" "" "POST" "multipart/form-data; boundary=${delim}")
+  response=$(_post "$content" "$_base_url/webapi/entry.cgi?api=SYNO.Core.Certificate&method=import&version=1&SynoToken=$token&_sid=$sid" "" "POST" "multipart/form-data; boundary=${delim}")
   _debug3 response "$response"
 
   if ! echo "$response" | grep '"error":' >/dev/null; then

From 7d7789ae96ef4061dfb97c41d45a7b017626d305 Mon Sep 17 00:00:00 2001
From: Brian Hartvigsen <brian.andrew@brianandjenny.com>
Date: Wed, 9 Dec 2020 20:35:50 -0700
Subject: [PATCH 33/41] Support DSM 6 and 7

Small changes for DSM 6:

All fields (except enable_syno_token as explained below) must either be in the GET params or the POST params, you can't mix GET and POST params
enable_syno_token=yes must be in both the GET and POST params.
If enable_syno_token=yes is only in the POST fields, then DSM6 returns a synotoken of --------. If enable_syno_token=yes is only in the GET params, then it returns no synotoken at all. It must be in both to work.
Need to use /webapi/auth.cgi instead of /webapi/entry.cgi
Verified with DSM 6.2.3-25426 Update 2 and DSM 7.0-40850
---
 deploy/synology_dsm.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/synology_dsm.sh b/deploy/synology_dsm.sh
index bca12d8d..edbc1e3e 100644
--- a/deploy/synology_dsm.sh
+++ b/deploy/synology_dsm.sh
@@ -90,7 +90,7 @@ synology_dsm_deploy() {
     _debug3 H1 "${_H1}"
   fi
 
-  response=$(_post "method=login&account=$encoded_username&passwd=$encoded_password&enable_device_token=yes&enable_syno_token=yes" "$_base_url/webapi/entry.cgi?api=SYNO.API.Auth&version=$api_version")
+  response=$(_post "method=login&account=$encoded_username&passwd=$encoded_password&api=SYNO.API.Auth&version=$api_version&enable_syno_token=yes" "$_base_url/webapi/auth.cgi?enable_syno_token=yes")
   token=$(echo "$response" | grep "synotoken" | sed -n 's/.*"synotoken" *: *"\([^"]*\).*/\1/p')
   _debug3 response "$response"
   _debug token "$token"

From 2635dfef9659a69d003cc2cb1f108a6c7de044a1 Mon Sep 17 00:00:00 2001
From: Brian Hartvigsen <brian.andrew@brianandjenny.com>
Date: Wed, 9 Dec 2020 21:01:44 -0700
Subject: [PATCH 34/41] Shellcheck linting

Also removed unused code
---
 deploy/synology_dsm.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/deploy/synology_dsm.sh b/deploy/synology_dsm.sh
index edbc1e3e..35d33209 100644
--- a/deploy/synology_dsm.sh
+++ b/deploy/synology_dsm.sh
@@ -21,10 +21,6 @@
 
 ########  Public functions #####################
 
-_syno_get_cookie_data() {
-  grep -i "\W$1=" "$HTTP_HEADER" | grep -i "^Set-Cookie:" | _tail_n 1 | _egrep_o "$1=[^;]*;" | tr -d ';'
-}
-
 #domain keyfile certfile cafile fullchain
 synology_dsm_deploy() {
 
@@ -84,7 +80,7 @@ synology_dsm_deploy() {
   encoded_username="$(printf "%s" "$SYNO_Username" | _url_encode)"
   encoded_password="$(printf "%s" "$SYNO_Password" | _url_encode)"
 
-  if [ ! -z "$SYNO_DID" ]; then
+  if [ -n "$SYNO_DID" ]; then
     _H1="Cookie: did=$SYNO_DID"
     export _H1
     _debug3 H1 "${_H1}"

From 15fb47cb3d0220de6db1c5cf41ecffd03f532275 Mon Sep 17 00:00:00 2001
From: neil <win10@neilpang.com>
Date: Thu, 10 Dec 2020 20:21:57 +0800
Subject: [PATCH 35/41] fix
 https://github.com/acmesh-official/acme.sh/issues/3300

---
 deploy/docker.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/deploy/docker.sh b/deploy/docker.sh
index 451d5d00..3aa1b2cd 100755
--- a/deploy/docker.sh
+++ b/deploy/docker.sh
@@ -275,6 +275,7 @@ _check_curl_version() {
 
   if [ "$_major$_minor" -lt "740" ]; then
     _err "curl v$_cversion doesn't support unit socket"
+    _err "Please upgrade to curl 7.40 or later."
     return 1
   fi
   if [ "$_major$_minor" -lt "750" ]; then

From cee20c4eb96ec8ec3ad789ae5e3902689598b0ee Mon Sep 17 00:00:00 2001
From: jimp100 <35727302+jimp100@users.noreply.github.com>
Date: Wed, 16 Dec 2020 10:11:43 +0000
Subject: [PATCH 36/41] Corrected regex for subdomains

A fix to handle subdomains of a duckdns domain.  I.e.  subdomain.mydomain.duckdns.org
Handles n number of subdomains
---
 dnsapi/dns_duckdns.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dnsapi/dns_duckdns.sh b/dnsapi/dns_duckdns.sh
index 41685147..618e12c6 100755
--- a/dnsapi/dns_duckdns.sh
+++ b/dnsapi/dns_duckdns.sh
@@ -96,7 +96,7 @@ dns_duckdns_rm() {
 _duckdns_get_domain() {
 
   # We'll extract the domain/username from full domain
-  _duckdns_domain="$(printf "%s" "$fulldomain" | _lower_case | _egrep_o '^(_acme-challenge\.)?[a-z0-9-]*\.duckdns\.org' | sed 's/^\(_acme-challenge\.\)\{0,1\}\([a-z0-9-]*\)\.duckdns\.org/\2/')"
+  _duckdns_domain="$(printf "%s" "$fulldomain" | _lower_case | _egrep_o '^(_acme-challenge\.)?([a-z0-9-]+\.)+duckdns\.org' | sed -n 's/^\([^.]\{1,\}\.\)*\([a-z0-9-]\{1,\}\)\.duckdns\.org$/\2/p;')"
 
   if [ -z "$_duckdns_domain" ]; then
     _err "Error extracting the domain."

From 48b2a271cc81a7ab8bf2bc229aa59d58f88c493e Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Sun, 20 Dec 2020 20:17:05 +0100
Subject: [PATCH 37/41] World4You Bugfix unable to parse paketnr

---
 dnsapi/dns_world4you.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dnsapi/dns_world4you.sh b/dnsapi/dns_world4you.sh
index 24b8dd68..9d36f84d 100644
--- a/dnsapi/dns_world4you.sh
+++ b/dnsapi/dns_world4you.sh
@@ -185,7 +185,8 @@ _get_paketnr() {
   fi
 
   TLD="$domain"
+  _debug domain "$domain"
   RECORD=$(echo "$fqdn" | cut -c"1-$((${#fqdn} - ${#TLD} - 1))")
-  PAKETNR=$(echo "$form" | grep "data-textfilter=\" $domain " | _head_n 1 | sed 's/^.* \([0-9]*\) .*$/\1/')
+  PAKETNR=$(echo "$form" | grep "data-textfilter=\".* $domain " | _head_n 1 | sed 's/^.* \([0-9]*\) .*$/\1/')
   return 0
 }

From ac4ae85a4a5c07b4124da3a2e3efce1747db45c7 Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Mon, 21 Dec 2020 09:39:09 +0100
Subject: [PATCH 38/41] World4You code refactor

---
 dnsapi/dns_world4you.sh | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/dnsapi/dns_world4you.sh b/dnsapi/dns_world4you.sh
index 9d36f84d..6baccbd0 100644
--- a/dnsapi/dns_world4you.sh
+++ b/dnsapi/dns_world4you.sh
@@ -52,17 +52,26 @@ AddDnsRecordForm[uniqueFormIdTTL]=$formidttl&AddDnsRecordForm[_token]=$form_toke
   ret=$(_post "$body" "$WORLD4YOU_API/$paketnr/dns" '' POST 'application/x-www-form-urlencoded')
   _resethttp
 
-  if grep '302' >/dev/null <"$HTTP_HEADER"; then
+  if _contains "$(_head_n 3 <"$HTTP_HEADER")" '302'; then
     res=$(_get "$WORLD4YOU_API/$paketnr/dns")
     if _contains "$res" "successfully"; then
       return 0
     else
       msg=$(echo "$res" | tr '\n' '\t' | sed 's/.*<h3 class="mb-5">[^\t]*\t *\([^\t]*\)\t.*/\1/')
+      if _contains "$msg" '^<\!DOCTYPE html>'; then
+        msg='Unknown error'
+      fi
       _err "Unable to add record: $msg"
+      if _contains "$msg" '^<\!DOCTYPE html>'; then
+        echo "$ret" > 'error-01.html'
+        echo "$res" > 'error-02.html'
+        _err "View error-01.html and error-02.html for debugging"
+      fi
       return 1
     fi
   else
-    _err "$(_head_n 1 <"$HTTP_HEADER")"
+    _err "$(_head_n 3 <"$HTTP_HEADER")"
+    _err "View $HTTP_HEADER for debugging"
     return 1
   fi
 }
@@ -111,17 +120,26 @@ DeleteDnsRecordForm[_token]=$form_token"
   ret=$(_post "$body" "$WORLD4YOU_API/$paketnr/deleteRecord" '' POST 'application/x-www-form-urlencoded')
   _resethttp
 
-  if grep '302' >/dev/null <"$HTTP_HEADER"; then
+  if _contains "$(_head_n 3 <"$HTTP_HEADER")" '302'; then
     res=$(_get "$WORLD4YOU_API/$paketnr/dns")
     if _contains "$res" "successfully"; then
       return 0
     else
       msg=$(echo "$res" | tr '\n' '\t' | sed 's/.*<h3 class="mb-5">[^\t]*\t *\([^\t]*\)\t.*/\1/')
+      if _contains "$msg" '^<\!DOCTYPE html>'; then
+        msg='Unknown error'
+      fi
       _err "Unable to remove record: $msg"
+      if _contains "$msg" '^<\!DOCTYPE html>'; then
+        echo "$ret" > 'error-01.html'
+        echo "$res" > 'error-02.html'
+        _err "View error-01.html and error-02.html for debugging"
+      fi
       return 1
     fi
   else
-    _err "$(_head_n 1 <"$HTTP_HEADER")"
+    _err "$(_head_n 3 <"$HTTP_HEADER")"
+    _err "View $HTTP_HEADER for debugging"
     return 1
   fi
 }
@@ -175,7 +193,7 @@ _get_paketnr() {
   domains=$(echo "$form" | grep '^ *[A-Za-z0-9_\.-]*\.[A-Za-z0-9_-]*$' | sed 's/^\s*\(\S*\)$/\1/')
   domain=''
   for domain in $domains; do
-    if echo "$fqdn" | grep "$domain\$" >/dev/null; then
+    if _contains "$fqdn" "$domain\$"; then
       break
     fi
     domain=''

From cb90167c76fa2a88eea8d16c463b2e674d02c009 Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Mon, 21 Dec 2020 09:41:05 +0100
Subject: [PATCH 39/41] World4You shellcheck

---
 dnsapi/dns_world4you.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dnsapi/dns_world4you.sh b/dnsapi/dns_world4you.sh
index 6baccbd0..9ab406f6 100644
--- a/dnsapi/dns_world4you.sh
+++ b/dnsapi/dns_world4you.sh
@@ -63,8 +63,8 @@ AddDnsRecordForm[uniqueFormIdTTL]=$formidttl&AddDnsRecordForm[_token]=$form_toke
       fi
       _err "Unable to add record: $msg"
       if _contains "$msg" '^<\!DOCTYPE html>'; then
-        echo "$ret" > 'error-01.html'
-        echo "$res" > 'error-02.html'
+        echo "$ret" >'error-01.html'
+        echo "$res" >'error-02.html'
         _err "View error-01.html and error-02.html for debugging"
       fi
       return 1
@@ -131,8 +131,8 @@ DeleteDnsRecordForm[_token]=$form_token"
       fi
       _err "Unable to remove record: $msg"
       if _contains "$msg" '^<\!DOCTYPE html>'; then
-        echo "$ret" > 'error-01.html'
-        echo "$res" > 'error-02.html'
+        echo "$ret" >'error-01.html'
+        echo "$res" >'error-02.html'
         _err "View error-01.html and error-02.html for debugging"
       fi
       return 1

From 8a24275ba929d55ab3c3060b3c54239c2e2855ec Mon Sep 17 00:00:00 2001
From: neil <win10@neilpang.com>
Date: Wed, 23 Dec 2020 20:45:43 +0800
Subject: [PATCH 40/41] add dns check wiki

---
 acme.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/acme.sh b/acme.sh
index ae387535..e78744c9 100755
--- a/acme.sh
+++ b/acme.sh
@@ -160,6 +160,8 @@ _SERVER_WIKI="https://github.com/acmesh-official/acme.sh/wiki/Server"
 
 _PREFERRED_CHAIN_WIKI="https://github.com/acmesh-official/acme.sh/wiki/Preferred-Chain"
 
+_DNSCHECK_WIKI="https://github.com/acmesh-official/acme.sh/wiki/dnscheck"
+
 _DNS_MANUAL_ERR="The dns manual mode can not renew automatically, you must issue it again manually. You'd better use the other modes instead."
 
 _DNS_MANUAL_WARN="It seems that you are using dns manual mode. please take care: $_DNS_MANUAL_ERR"
@@ -3958,6 +3960,8 @@ _check_dns_entries() {
   _end_time="$(_math "$_end_time" + 1200)" #let's check no more than 20 minutes.
 
   while [ "$(_time)" -le "$_end_time" ]; do
+    _info "You can use '--dnssleep' to disable public dns checks."
+    _info "See: $_DNSCHECK_WIKI"
     _left=""
     for entry in $dns_entries; do
       d=$(_getfield "$entry" 1)

From d6083c68fd3d174fb2ae6025d19965dcf332ac52 Mon Sep 17 00:00:00 2001
From: neil <win10@neilpang.com>
Date: Mon, 28 Dec 2020 21:10:22 +0800
Subject: [PATCH 41/41] add libidn

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 6b382242..4618efaf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,6 +12,7 @@ RUN apk update -f \
   tzdata \
   oath-toolkit-oathtool \
   tar \
+  libidn \
   && rm -rf /var/cache/apk/*
 
 ENV LE_CONFIG_HOME /acme.sh