From f21ef0d2e9ee0a6cbb020dc1cf3edbe0f615c1c6 Mon Sep 17 00:00:00 2001
From: ThiloGa <thilo.gass@gmail.com>
Date: Sat, 7 Mar 2020 14:55:09 +0100
Subject: [PATCH 01/17] add support for namemaster.de

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

diff --git a/dnsapi/dns_nm.sh b/dnsapi/dns_nm.sh
new file mode 100644
index 00000000..53c0c768
--- /dev/null
+++ b/dnsapi/dns_nm.sh
@@ -0,0 +1,92 @@
+#!/usr/bin/env sh
+
+########################################################################
+# https://namemaster.de hook script for acme.sh
+#
+# Environment variables:
+#
+#  - $NM_user      (your namemaster.de API username)
+#  - $NM_md5       (your namemaster.de API password_as_md5hash)
+#
+# Author: Thilo Gass <thilo.gass@gmail.com>
+# Git repo: https://github.com/ThiloGa/acme.sh
+
+#-- dns_nm_add() - Add TXT record --------------------------------------
+# Usage: dns_nm_add _acme-challenge.subdomain.domain.com "XyZ123..."
+
+dns_nm_add() {
+  fulldomain=$1
+  txt_value=$2
+  _info "Using DNS-01 namemaster hook"
+  
+  NM_user="${NM_user:-$(_readaccountconf_mutable NM_user)}"
+  NM_md5="${NM_md5:-$(_readaccountconf_mutable NM_md5)}"
+  if [ -z "$NM_user" ] || [ -z "$NM_md5" ]; then
+    NM_user=""
+    NM_md5=""
+	_err "No auth details provided. Please set user credentials using the \$NM_user and \$NM_md5 environment variables."
+    return 1
+  fi
+  #save the api user and md5 password to the account conf file.
+  _debug "Save user and hash"
+  _saveaccountconf_mutable NM_user "$NM_user"
+  _saveaccountconf_mutable NM_md5 "$NM_md5"
+ 
+ 
+  zone="$(echo $fulldomain | _egrep_o "[^.]+.[^.]+$")"
+  get="https://namemaster.de/api/api.php?User=$NM_user&Password=$NM_md5&Antwort=csv&Int=0&Typ=ACME&Zone=$zone&hostname=$fulldomain&TXT=$txt_value&Action=Auto&Lifetime=3600"
+  erg="$(_get "$get")"
+
+  if [ "$?" != "0" ]; then
+    _err "error $action $zone TXT: $txt"
+    _err "Error $?"
+	return 1
+  fi
+
+  if _contains "$erg" "Success"; then
+    _info "Success, TXT Added, OK"
+  else
+    _err "error Auto $zone TXT: $txt erg: $erg"
+    return 1
+  fi
+
+  _debug "ok Auto $zone TXT: $txt erg: $erg"
+  return 0
+}
+
+dns_nm_rm() {
+
+fulldomain=$1
+txt_value=$2
+
+  NM_user="${NM_user:-$(_readaccountconf_mutable NM_user)}"
+  NM_md5="${NM_md5:-$(_readaccountconf_mutable NM_md5)}"
+  if [ -z "$NM_user" ] || [ -z "$NM_md5" ]; then
+    NM_user=""
+    NM_md5=""
+  	_err "No auth details provided. Please set user credentials using the \$NM_user and \$NM_md5 environment variables."
+    return 1
+  fi
+
+  zone="$(echo $fulldomain | _egrep_o "[^.]+.[^.]+$")"
+  get="https://namemaster.de/api/api.php?User=$NM_user&Password=$NM_md5&Antwort=csv&Int=0&Typ=TXT&Zone=$zone&hostname=$fulldomain&TXT=$txt_value&Action=Delete_IN&TTL=0"
+  erg="$(_get "$get")"
+  if [ "$?" != "0" ]; then
+    _err "error $action $zone TXT: $txt"
+	_err "Error $?"
+    return 1
+  fi
+
+if _contains "$erg" "Success"; then
+  _info "Success, TXT removed, OK"
+
+else
+  _err "error Auto $zone TXT: $txt erg: $erg"
+  return 1
+fi
+
+_debug "ok Auto $zone TXT: $txt erg: $erg"
+return 0
+
+
+}

From 30416f54d169fbf391df1dffbea939003f69acd0 Mon Sep 17 00:00:00 2001
From: ThiloGa <thilo.gass@gmail.com>
Date: Sat, 7 Mar 2020 15:18:25 +0100
Subject: [PATCH 02/17] Fixes for Travis CI  -removing some blanks etc.

---
 dnsapi/dns_nm.sh | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/dnsapi/dns_nm.sh b/dnsapi/dns_nm.sh
index 53c0c768..b7e2d498 100644
--- a/dnsapi/dns_nm.sh
+++ b/dnsapi/dns_nm.sh
@@ -18,29 +18,28 @@ dns_nm_add() {
   fulldomain=$1
   txt_value=$2
   _info "Using DNS-01 namemaster hook"
-  
+
   NM_user="${NM_user:-$(_readaccountconf_mutable NM_user)}"
   NM_md5="${NM_md5:-$(_readaccountconf_mutable NM_md5)}"
   if [ -z "$NM_user" ] || [ -z "$NM_md5" ]; then
     NM_user=""
     NM_md5=""
-	_err "No auth details provided. Please set user credentials using the \$NM_user and \$NM_md5 environment variables."
+    _err "No auth details provided. Please set user credentials using the \$NM_user and \$NM_md5 environment variables."
     return 1
   fi
   #save the api user and md5 password to the account conf file.
   _debug "Save user and hash"
   _saveaccountconf_mutable NM_user "$NM_user"
   _saveaccountconf_mutable NM_md5 "$NM_md5"
- 
- 
+
   zone="$(echo $fulldomain | _egrep_o "[^.]+.[^.]+$")"
   get="https://namemaster.de/api/api.php?User=$NM_user&Password=$NM_md5&Antwort=csv&Int=0&Typ=ACME&Zone=$zone&hostname=$fulldomain&TXT=$txt_value&Action=Auto&Lifetime=3600"
   erg="$(_get "$get")"
 
   if [ "$?" != "0" ]; then
-    _err "error $action $zone TXT: $txt"
+    _err "error Auto $zone TXT: $txt"
     _err "Error $?"
-	return 1
+    return 1
   fi
 
   if _contains "$erg" "Success"; then
@@ -56,15 +55,15 @@ dns_nm_add() {
 
 dns_nm_rm() {
 
-fulldomain=$1
-txt_value=$2
+  fulldomain=$1
+  txt_value=$2
 
   NM_user="${NM_user:-$(_readaccountconf_mutable NM_user)}"
   NM_md5="${NM_md5:-$(_readaccountconf_mutable NM_md5)}"
   if [ -z "$NM_user" ] || [ -z "$NM_md5" ]; then
     NM_user=""
     NM_md5=""
-  	_err "No auth details provided. Please set user credentials using the \$NM_user and \$NM_md5 environment variables."
+    _err "No auth details provided. Please set user credentials using the \$NM_user and \$NM_md5 environment variables."
     return 1
   fi
 
@@ -73,20 +72,19 @@ txt_value=$2
   erg="$(_get "$get")"
   if [ "$?" != "0" ]; then
     _err "error $action $zone TXT: $txt"
-	_err "Error $?"
+    _err "Error $?"
     return 1
   fi
 
-if _contains "$erg" "Success"; then
-  _info "Success, TXT removed, OK"
+  if _contains "$erg" "Success"; then
+    _info "Success, TXT removed, OK"
+  else
+    _err "error Auto $zone TXT: $txt erg: $erg"
+    return 1
+  fi
 
-else
-  _err "error Auto $zone TXT: $txt erg: $erg"
-  return 1
-fi
-
-_debug "ok Auto $zone TXT: $txt erg: $erg"
-return 0
+  _debug "ok Auto $zone TXT: $txt erg: $erg"
+  return 0
 
 
 }

From 3b01bf7bda9e2d05db2bc7e1f2a25d9233c0d021 Mon Sep 17 00:00:00 2001
From: ThiloGa <thilo.gass@gmail.com>
Date: Sat, 7 Mar 2020 15:33:21 +0100
Subject: [PATCH 03/17] removed the probably last blank line

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

diff --git a/dnsapi/dns_nm.sh b/dnsapi/dns_nm.sh
index b7e2d498..9928270b 100644
--- a/dnsapi/dns_nm.sh
+++ b/dnsapi/dns_nm.sh
@@ -37,7 +37,7 @@ dns_nm_add() {
   erg="$(_get "$get")"
 
   if [ "$?" != "0" ]; then
-    _err "error Auto $zone TXT: $txt"
+    _err "error Auto $zone TXT: $txt_value"
     _err "Error $?"
     return 1
   fi
@@ -45,11 +45,11 @@ dns_nm_add() {
   if _contains "$erg" "Success"; then
     _info "Success, TXT Added, OK"
   else
-    _err "error Auto $zone TXT: $txt erg: $erg"
+    _err "error Auto $zone TXT: $txt_value erg: $erg"
     return 1
   fi
 
-  _debug "ok Auto $zone TXT: $txt erg: $erg"
+  _debug "ok Auto $zone TXT: $txt_value erg: $erg"
   return 0
 }
 
@@ -71,7 +71,7 @@ dns_nm_rm() {
   get="https://namemaster.de/api/api.php?User=$NM_user&Password=$NM_md5&Antwort=csv&Int=0&Typ=TXT&Zone=$zone&hostname=$fulldomain&TXT=$txt_value&Action=Delete_IN&TTL=0"
   erg="$(_get "$get")"
   if [ "$?" != "0" ]; then
-    _err "error $action $zone TXT: $txt"
+    _err "error $action $zone TXT: $txt_value"
     _err "Error $?"
     return 1
   fi
@@ -79,12 +79,11 @@ dns_nm_rm() {
   if _contains "$erg" "Success"; then
     _info "Success, TXT removed, OK"
   else
-    _err "error Auto $zone TXT: $txt erg: $erg"
+    _err "error Auto $zone TXT: $txt_value erg: $erg"
     return 1
   fi
 
-  _debug "ok Auto $zone TXT: $txt erg: $erg"
+  _debug "ok Auto $zone TXT: $txt_value erg: $erg"
   return 0
 
-
 }

From 142ca58d387c248ca34fec45efcc08bc981e62df Mon Sep 17 00:00:00 2001
From: ThiloGa <thilo.gass@gmail.com>
Date: Sat, 7 Mar 2020 15:45:41 +0100
Subject: [PATCH 04/17]  removed some unused Vars

---
 acme.sh          | 1 -
 dnsapi/dns_nm.sh | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/acme.sh b/acme.sh
index 12f2cbed..4d9a7c25 100755
--- a/acme.sh
+++ b/acme.sh
@@ -48,7 +48,6 @@ LOCAL_ANY_ADDRESS="0.0.0.0"
 
 DEFAULT_RENEW=60
 
-
 NO_VALUE="no"
 
 W_DNS="dns"
diff --git a/dnsapi/dns_nm.sh b/dnsapi/dns_nm.sh
index 9928270b..4c3f6c44 100644
--- a/dnsapi/dns_nm.sh
+++ b/dnsapi/dns_nm.sh
@@ -37,7 +37,7 @@ dns_nm_add() {
   erg="$(_get "$get")"
 
   if [ "$?" != "0" ]; then
-    _err "error Auto $zone TXT: $txt_value"
+    _err "error Ading $zone TXT: $txt_value"
     _err "Error $?"
     return 1
   fi
@@ -45,7 +45,7 @@ dns_nm_add() {
   if _contains "$erg" "Success"; then
     _info "Success, TXT Added, OK"
   else
-    _err "error Auto $zone TXT: $txt_value erg: $erg"
+    _err "error Adding $zone TXT: $txt_value erg: $erg"
     return 1
   fi
 
@@ -71,7 +71,7 @@ dns_nm_rm() {
   get="https://namemaster.de/api/api.php?User=$NM_user&Password=$NM_md5&Antwort=csv&Int=0&Typ=TXT&Zone=$zone&hostname=$fulldomain&TXT=$txt_value&Action=Delete_IN&TTL=0"
   erg="$(_get "$get")"
   if [ "$?" != "0" ]; then
-    _err "error $action $zone TXT: $txt_value"
+    _err "error Deleting $zone TXT: $txt_value"
     _err "Error $?"
     return 1
   fi

From e1e1ee31f07d28d460be4677f3ef75221fe3aa38 Mon Sep 17 00:00:00 2001
From: ThiloGa <thilo.gass@gmail.com>
Date: Sat, 7 Mar 2020 16:00:52 +0100
Subject: [PATCH 05/17] Dont use $? directly anymore

---
 dnsapi/dns_nm.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/dnsapi/dns_nm.sh b/dnsapi/dns_nm.sh
index 4c3f6c44..7ba5ce3c 100644
--- a/dnsapi/dns_nm.sh
+++ b/dnsapi/dns_nm.sh
@@ -36,9 +36,10 @@ dns_nm_add() {
   get="https://namemaster.de/api/api.php?User=$NM_user&Password=$NM_md5&Antwort=csv&Int=0&Typ=ACME&Zone=$zone&hostname=$fulldomain&TXT=$txt_value&Action=Auto&Lifetime=3600"
   erg="$(_get "$get")"
 
-  if [ "$?" != "0" ]; then
+  exit_code="$?"
+  if [ "$exit_code" != 0 ]; then
     _err "error Ading $zone TXT: $txt_value"
-    _err "Error $?"
+    _err "Error $exit_code"
     return 1
   fi
 
@@ -70,9 +71,11 @@ dns_nm_rm() {
   zone="$(echo $fulldomain | _egrep_o "[^.]+.[^.]+$")"
   get="https://namemaster.de/api/api.php?User=$NM_user&Password=$NM_md5&Antwort=csv&Int=0&Typ=TXT&Zone=$zone&hostname=$fulldomain&TXT=$txt_value&Action=Delete_IN&TTL=0"
   erg="$(_get "$get")"
-  if [ "$?" != "0" ]; then
+
+  exit_code="$?"
+  if [ "$exit_code" != "0" ]; then
     _err "error Deleting $zone TXT: $txt_value"
-    _err "Error $?"
+    _err "Error $exit_code?"
     return 1
   fi
 

From efef76d9cf2edd8711bd15d795942647a780e889 Mon Sep 17 00:00:00 2001
From: ThiloGa <thilo.gass@gmail.com>
Date: Sat, 7 Mar 2020 19:34:57 +0100
Subject: [PATCH 06/17] fixed typo

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

diff --git a/dnsapi/dns_nm.sh b/dnsapi/dns_nm.sh
index 7ba5ce3c..ec0e2d88 100644
--- a/dnsapi/dns_nm.sh
+++ b/dnsapi/dns_nm.sh
@@ -75,7 +75,7 @@ dns_nm_rm() {
   exit_code="$?"
   if [ "$exit_code" != "0" ]; then
     _err "error Deleting $zone TXT: $txt_value"
-    _err "Error $exit_code?"
+    _err "Error $exit_code"
     return 1
   fi
 

From 7d7e9501facc62f89618c2ad12963a57de253e82 Mon Sep 17 00:00:00 2001
From: ThiloGa <thilo.gass@gmail.com>
Date: Sat, 7 Mar 2020 20:37:29 +0100
Subject: [PATCH 07/17] fixing
 https://github.com/koalaman/shellcheck/wiki/SC2181 problems

---
 dnsapi/dns_nm.sh | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/dnsapi/dns_nm.sh b/dnsapi/dns_nm.sh
index ec0e2d88..af98bbe3 100644
--- a/dnsapi/dns_nm.sh
+++ b/dnsapi/dns_nm.sh
@@ -34,11 +34,10 @@ dns_nm_add() {
 
   zone="$(echo $fulldomain | _egrep_o "[^.]+.[^.]+$")"
   get="https://namemaster.de/api/api.php?User=$NM_user&Password=$NM_md5&Antwort=csv&Int=0&Typ=ACME&Zone=$zone&hostname=$fulldomain&TXT=$txt_value&Action=Auto&Lifetime=3600"
-  erg="$(_get "$get")"
 
-  exit_code="$?"
-  if [ "$exit_code" != 0 ]; then
-    _err "error Ading $zone TXT: $txt_value"
+  if !   erg="$(_get "$get")"
+  then
+    _err "error Deleting $zone TXT: $txt_value"
     _err "Error $exit_code"
     return 1
   fi
@@ -70,10 +69,9 @@ dns_nm_rm() {
 
   zone="$(echo $fulldomain | _egrep_o "[^.]+.[^.]+$")"
   get="https://namemaster.de/api/api.php?User=$NM_user&Password=$NM_md5&Antwort=csv&Int=0&Typ=TXT&Zone=$zone&hostname=$fulldomain&TXT=$txt_value&Action=Delete_IN&TTL=0"
-  erg="$(_get "$get")"
 
-  exit_code="$?"
-  if [ "$exit_code" != "0" ]; then
+  if !   erg="$(_get "$get")"
+  then
     _err "error Deleting $zone TXT: $txt_value"
     _err "Error $exit_code"
     return 1

From 20702d26ec1dc48aa228052d4703d4569e0c2dcc Mon Sep 17 00:00:00 2001
From: ThiloGa <thilo.gass@gmail.com>
Date: Sat, 7 Mar 2020 21:05:42 +0100
Subject: [PATCH 08/17] fixing
 https://github.com/koalaman/shellcheck/wiki/SC2181 problems

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

diff --git a/dnsapi/dns_nm.sh b/dnsapi/dns_nm.sh
index af98bbe3..090101e3 100644
--- a/dnsapi/dns_nm.sh
+++ b/dnsapi/dns_nm.sh
@@ -35,8 +35,7 @@ dns_nm_add() {
   zone="$(echo $fulldomain | _egrep_o "[^.]+.[^.]+$")"
   get="https://namemaster.de/api/api.php?User=$NM_user&Password=$NM_md5&Antwort=csv&Int=0&Typ=ACME&Zone=$zone&hostname=$fulldomain&TXT=$txt_value&Action=Auto&Lifetime=3600"
 
-  if !   erg="$(_get "$get")"
-  then
+  if ! erg="$(_get "$get")"; then
     _err "error Deleting $zone TXT: $txt_value"
     _err "Error $exit_code"
     return 1
@@ -70,8 +69,7 @@ dns_nm_rm() {
   zone="$(echo $fulldomain | _egrep_o "[^.]+.[^.]+$")"
   get="https://namemaster.de/api/api.php?User=$NM_user&Password=$NM_md5&Antwort=csv&Int=0&Typ=TXT&Zone=$zone&hostname=$fulldomain&TXT=$txt_value&Action=Delete_IN&TTL=0"
 
-  if !   erg="$(_get "$get")"
-  then
+  if ! erg="$(_get "$get")"; then
     _err "error Deleting $zone TXT: $txt_value"
     _err "Error $exit_code"
     return 1

From d8dbb85946527ee377eaae82dc9876fd88c7adc9 Mon Sep 17 00:00:00 2001
From: ThiloGa <thilo.gass@gmail.com>
Date: Sat, 7 Mar 2020 21:11:08 +0100
Subject: [PATCH 09/17] small fixes

---
 dnsapi/dns_nm.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dnsapi/dns_nm.sh b/dnsapi/dns_nm.sh
index 090101e3..74ffd6f2 100644
--- a/dnsapi/dns_nm.sh
+++ b/dnsapi/dns_nm.sh
@@ -37,7 +37,6 @@ dns_nm_add() {
 
   if ! erg="$(_get "$get")"; then
     _err "error Deleting $zone TXT: $txt_value"
-    _err "Error $exit_code"
     return 1
   fi
 
@@ -50,6 +49,7 @@ dns_nm_add() {
 
   _debug "ok Auto $zone TXT: $txt_value erg: $erg"
   return 0
+
 }
 
 dns_nm_rm() {
@@ -71,7 +71,6 @@ dns_nm_rm() {
 
   if ! erg="$(_get "$get")"; then
     _err "error Deleting $zone TXT: $txt_value"
-    _err "Error $exit_code"
     return 1
   fi
 

From 3c79bb77db87fd3e94b0b8431cf65d8469b4dd90 Mon Sep 17 00:00:00 2001
From: ThiloGa <thilo.gass@gmail.com>
Date: Sat, 7 Mar 2020 21:21:39 +0100
Subject: [PATCH 10/17] fixing travis-ci warnings SC2086: Double quote to
 prevent globbing and word splitting.

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

diff --git a/dnsapi/dns_nm.sh b/dnsapi/dns_nm.sh
index 74ffd6f2..f5b0bd0e 100644
--- a/dnsapi/dns_nm.sh
+++ b/dnsapi/dns_nm.sh
@@ -32,7 +32,7 @@ dns_nm_add() {
   _saveaccountconf_mutable NM_user "$NM_user"
   _saveaccountconf_mutable NM_md5 "$NM_md5"
 
-  zone="$(echo $fulldomain | _egrep_o "[^.]+.[^.]+$")"
+  zone="$(echo "$fulldomain" | _egrep_o "[^.]+.[^.]+$")"
   get="https://namemaster.de/api/api.php?User=$NM_user&Password=$NM_md5&Antwort=csv&Int=0&Typ=ACME&Zone=$zone&hostname=$fulldomain&TXT=$txt_value&Action=Auto&Lifetime=3600"
 
   if ! erg="$(_get "$get")"; then
@@ -66,7 +66,7 @@ dns_nm_rm() {
     return 1
   fi
 
-  zone="$(echo $fulldomain | _egrep_o "[^.]+.[^.]+$")"
+  zone="$(echo "$fulldomain" | _egrep_o "[^.]+.[^.]+$")"
   get="https://namemaster.de/api/api.php?User=$NM_user&Password=$NM_md5&Antwort=csv&Int=0&Typ=TXT&Zone=$zone&hostname=$fulldomain&TXT=$txt_value&Action=Delete_IN&TTL=0"
 
   if ! erg="$(_get "$get")"; then

From f61f2d6e5e024e7e08687beaacf8a9807c3a6bee Mon Sep 17 00:00:00 2001
From: ThiloGa <thilo.gass@gmail.com>
Date: Sat, 21 Mar 2020 19:28:16 +0100
Subject: [PATCH 11/17] adaptations to the new api functions _get_root fully
 functional due to the extended api

---
 dnsapi/dns_nm.sh | 81 ++++++++++++++++++++++++++++++++++--------------
 1 file changed, 57 insertions(+), 24 deletions(-)

diff --git a/dnsapi/dns_nm.sh b/dnsapi/dns_nm.sh
index f5b0bd0e..f9e98b2a 100644
--- a/dnsapi/dns_nm.sh
+++ b/dnsapi/dns_nm.sh
@@ -6,7 +6,7 @@
 # Environment variables:
 #
 #  - $NM_user      (your namemaster.de API username)
-#  - $NM_md5       (your namemaster.de API password_as_md5hash)
+#  - $NM_sha256       (your namemaster.de API password_as_sha256hash)
 #
 # Author: Thilo Gass <thilo.gass@gmail.com>
 # Git repo: https://github.com/ThiloGa/acme.sh
@@ -14,42 +14,53 @@
 #-- dns_nm_add() - Add TXT record --------------------------------------
 # Usage: dns_nm_add _acme-challenge.subdomain.domain.com "XyZ123..."
 
+namemaster_api="https://namemaster.de/api/api.php"
+
+
 dns_nm_add() {
   fulldomain=$1
   txt_value=$2
   _info "Using DNS-01 namemaster hook"
 
   NM_user="${NM_user:-$(_readaccountconf_mutable NM_user)}"
-  NM_md5="${NM_md5:-$(_readaccountconf_mutable NM_md5)}"
-  if [ -z "$NM_user" ] || [ -z "$NM_md5" ]; then
+  NM_sha256="${NM_sha256:-$(_readaccountconf_mutable NM_sha256)}"
+  if [ -z "$NM_user" ] || [ -z "$NM_sha256" ]; then
     NM_user=""
-    NM_md5=""
-    _err "No auth details provided. Please set user credentials using the \$NM_user and \$NM_md5 environment variables."
+    NM_sha256=""
+    _err "No auth details provided. Please set user credentials using the \$NM_user and \$NM_sha256 environment variables."
     return 1
   fi
-  #save the api user and md5 password to the account conf file.
+  #save the api user and sha256 password to the account conf file.
   _debug "Save user and hash"
   _saveaccountconf_mutable NM_user "$NM_user"
-  _saveaccountconf_mutable NM_md5 "$NM_md5"
+  _saveaccountconf_mutable NM_sha256 "$NM_sha256"
 
-  zone="$(echo "$fulldomain" | _egrep_o "[^.]+.[^.]+$")"
-  get="https://namemaster.de/api/api.php?User=$NM_user&Password=$NM_md5&Antwort=csv&Int=0&Typ=ACME&Zone=$zone&hostname=$fulldomain&TXT=$txt_value&Action=Auto&Lifetime=3600"
 
-  if ! erg="$(_get "$get")"; then
-    _err "error Deleting $zone TXT: $txt_value"
+  _debug "First detect the root zone"
+  if ! _get_root "$fulldomain"; then
+    _err "invalid domain" "$fulldomain"
+    return 1
+  fi
+
+  _info "die Zone lautet:" "$zone"
+
+  get="$namemaster_api?User=$NM_user&Password=$NM_sha256&Antwort=csv&Typ=ACME&zone=$zone&hostname=$fulldomain&TXT=$txt_value&Action=Auto&Lifetime=3600"
+
+  if !   erg="$(_get "$get")"
+  then
+    _err "error Adding $fulldomain TXT: $txt_value"
     return 1
   fi
 
   if _contains "$erg" "Success"; then
     _info "Success, TXT Added, OK"
   else
-    _err "error Adding $zone TXT: $txt_value erg: $erg"
+    _err "error Adding $fulldomain TXT: $txt_value erg: $erg"
     return 1
   fi
 
-  _debug "ok Auto $zone TXT: $txt_value erg: $erg"
+  _debug "ok Auto $fulldomain TXT: $txt_value erg: $erg"
   return 0
-
 }
 
 dns_nm_rm() {
@@ -58,30 +69,52 @@ dns_nm_rm() {
   txt_value=$2
 
   NM_user="${NM_user:-$(_readaccountconf_mutable NM_user)}"
-  NM_md5="${NM_md5:-$(_readaccountconf_mutable NM_md5)}"
-  if [ -z "$NM_user" ] || [ -z "$NM_md5" ]; then
+  NM_sha256="${NM_sha256:-$(_readaccountconf_mutable NM_sha256)}"
+  if [ -z "$NM_user" ] || [ -z "$NM_sha256" ]; then
     NM_user=""
-    NM_md5=""
-    _err "No auth details provided. Please set user credentials using the \$NM_user and \$NM_md5 environment variables."
+    NM_sha256=""
+    _err "No auth details provided. Please set user credentials using the \$NM_user and \$NM_sha256 environment variables."
     return 1
   fi
 
-  zone="$(echo "$fulldomain" | _egrep_o "[^.]+.[^.]+$")"
-  get="https://namemaster.de/api/api.php?User=$NM_user&Password=$NM_md5&Antwort=csv&Int=0&Typ=TXT&Zone=$zone&hostname=$fulldomain&TXT=$txt_value&Action=Delete_IN&TTL=0"
 
-  if ! erg="$(_get "$get")"; then
-    _err "error Deleting $zone TXT: $txt_value"
+  zone="$(echo "$fulldomain" | _egrep_o "[^.]+.[^.]+$")"
+  get="$namemaster_api?User=$NM_user&Password=$NM_sha256&Antwort=csv&Typ=TXT&Zone=$zone&hostname=$fulldomain&TXT=$txt_value&Action=Delete_IN"
+
+  if !   erg="$(_get "$get")"
+  then
+    _err "error Deleting $fulldomain TXT: $txt_value"
     return 1
   fi
 
   if _contains "$erg" "Success"; then
     _info "Success, TXT removed, OK"
   else
-    _err "error Auto $zone TXT: $txt_value erg: $erg"
+    _err "error Auto $fulldomain TXT: $txt_value erg: $erg"
     return 1
   fi
 
-  _debug "ok Auto $zone TXT: $txt_value erg: $erg"
+  _debug "ok Auto $fulldomain TXT: $txt_value erg: $erg"
   return 0
 
 }
+
+
+_get_root() {
+
+  domain=$1
+
+  get="$namemaster_api?User=$NM_user&Password=$NM_sha256&Typ=acme&hostname=$domain&Action=getzone&antwort=csv"
+
+  if ! zone="$(_get "$get")"
+  then
+    _err "error getting Zone"
+    return 1
+  else
+    if _contains "$zone" "hostname not found"
+    then
+      return 1
+    fi
+  fi
+
+}
\ No newline at end of file

From 598f29b78e107baad00e8a07365c322d41c5b2c9 Mon Sep 17 00:00:00 2001
From: ThiloGa <thilo.gass@gmail.com>
Date: Sat, 21 Mar 2020 19:41:46 +0100
Subject: [PATCH 12/17] doing shellcheck staff

---
 dnsapi/dns_nm.sh | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/dnsapi/dns_nm.sh b/dnsapi/dns_nm.sh
index f9e98b2a..24ff5409 100644
--- a/dnsapi/dns_nm.sh
+++ b/dnsapi/dns_nm.sh
@@ -16,7 +16,6 @@
 
 namemaster_api="https://namemaster.de/api/api.php"
 
-
 dns_nm_add() {
   fulldomain=$1
   txt_value=$2
@@ -35,7 +34,6 @@ dns_nm_add() {
   _saveaccountconf_mutable NM_user "$NM_user"
   _saveaccountconf_mutable NM_sha256 "$NM_sha256"
 
-
   _debug "First detect the root zone"
   if ! _get_root "$fulldomain"; then
     _err "invalid domain" "$fulldomain"
@@ -46,8 +44,8 @@ dns_nm_add() {
 
   get="$namemaster_api?User=$NM_user&Password=$NM_sha256&Antwort=csv&Typ=ACME&zone=$zone&hostname=$fulldomain&TXT=$txt_value&Action=Auto&Lifetime=3600"
 
-  if !   erg="$(_get "$get")"
-  then
+
+  if ! erg="$(_get "$get")"; then
     _err "error Adding $fulldomain TXT: $txt_value"
     return 1
   fi
@@ -77,12 +75,10 @@ dns_nm_rm() {
     return 1
   fi
 
-
   zone="$(echo "$fulldomain" | _egrep_o "[^.]+.[^.]+$")"
   get="$namemaster_api?User=$NM_user&Password=$NM_sha256&Antwort=csv&Typ=TXT&Zone=$zone&hostname=$fulldomain&TXT=$txt_value&Action=Delete_IN"
 
-  if !   erg="$(_get "$get")"
-  then
+  if ! erg="$(_get "$get")"; then
     _err "error Deleting $fulldomain TXT: $txt_value"
     return 1
   fi
@@ -99,15 +95,13 @@ dns_nm_rm() {
 
 }
 
-
 _get_root() {
 
   domain=$1
 
   get="$namemaster_api?User=$NM_user&Password=$NM_sha256&Typ=acme&hostname=$domain&Action=getzone&antwort=csv"
 
-  if ! zone="$(_get "$get")"
-  then
+  if ! zone="$(_get "$get")"; then
     _err "error getting Zone"
     return 1
   else
@@ -117,4 +111,4 @@ _get_root() {
     fi
   fi
 
-}
\ No newline at end of file
+}

From a1c4d159dd1710cd451f3d0bcac15b6b9121f58f Mon Sep 17 00:00:00 2001
From: ThiloGa <thilo.gass@gmail.com>
Date: Sat, 21 Mar 2020 19:48:17 +0100
Subject: [PATCH 13/17] further shellcheck fixes

---
 dnsapi/dns_nm.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dnsapi/dns_nm.sh b/dnsapi/dns_nm.sh
index 24ff5409..18369ebd 100644
--- a/dnsapi/dns_nm.sh
+++ b/dnsapi/dns_nm.sh
@@ -44,7 +44,6 @@ dns_nm_add() {
 
   get="$namemaster_api?User=$NM_user&Password=$NM_sha256&Antwort=csv&Typ=ACME&zone=$zone&hostname=$fulldomain&TXT=$txt_value&Action=Auto&Lifetime=3600"
 
-
   if ! erg="$(_get "$get")"; then
     _err "error Adding $fulldomain TXT: $txt_value"
     return 1
@@ -105,8 +104,7 @@ _get_root() {
     _err "error getting Zone"
     return 1
   else
-    if _contains "$zone" "hostname not found"
-    then
+    if _contains "$zone" "hostname not found"; then
       return 1
     fi
   fi

From bc2ed602e7d4596a1f1a0d009b8ed152a8987862 Mon Sep 17 00:00:00 2001
From: ThiloGa <thilo.gass@gmail.com>
Date: Sat, 21 Mar 2020 21:18:25 +0100
Subject: [PATCH 14/17] deleted txt entry routine by request of namemaster.de,
 entry is deleted automatically

---
 dnsapi/dns_nm.sh | 32 ++++----------------------------
 1 file changed, 4 insertions(+), 28 deletions(-)

diff --git a/dnsapi/dns_nm.sh b/dnsapi/dns_nm.sh
index 18369ebd..4dfcc777 100644
--- a/dnsapi/dns_nm.sh
+++ b/dnsapi/dns_nm.sh
@@ -63,34 +63,10 @@ dns_nm_add() {
 dns_nm_rm() {
 
   fulldomain=$1
-  txt_value=$2
-
-  NM_user="${NM_user:-$(_readaccountconf_mutable NM_user)}"
-  NM_sha256="${NM_sha256:-$(_readaccountconf_mutable NM_sha256)}"
-  if [ -z "$NM_user" ] || [ -z "$NM_sha256" ]; then
-    NM_user=""
-    NM_sha256=""
-    _err "No auth details provided. Please set user credentials using the \$NM_user and \$NM_sha256 environment variables."
-    return 1
-  fi
-
-  zone="$(echo "$fulldomain" | _egrep_o "[^.]+.[^.]+$")"
-  get="$namemaster_api?User=$NM_user&Password=$NM_sha256&Antwort=csv&Typ=TXT&Zone=$zone&hostname=$fulldomain&TXT=$txt_value&Action=Delete_IN"
-
-  if ! erg="$(_get "$get")"; then
-    _err "error Deleting $fulldomain TXT: $txt_value"
-    return 1
-  fi
-
-  if _contains "$erg" "Success"; then
-    _info "Success, TXT removed, OK"
-  else
-    _err "error Auto $fulldomain TXT: $txt_value erg: $erg"
-    return 1
-  fi
-
-  _debug "ok Auto $fulldomain TXT: $txt_value erg: $erg"
-  return 0
+  txtvalue=$2
+  _info "TXT enrty in $fulldomain is deleted automatically"
+  _debug fulldomain "$fulldomain"
+  _debug txtvalue "$txtvalue"
 
 }
 

From 6132af8ecb1e978f1e9d01f2670af22b7d179d8a Mon Sep 17 00:00:00 2001
From: ucando <ucando.wen@qq.com>
Date: Thu, 26 Mar 2020 14:59:23 +0800
Subject: [PATCH 15/17] enable qiniu to deploy more than one domain

---
 deploy/qiniu.sh | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/deploy/qiniu.sh b/deploy/qiniu.sh
index 13b09651..70669917 100644
--- a/deploy/qiniu.sh
+++ b/deploy/qiniu.sh
@@ -6,6 +6,8 @@
 # export QINIU_AK="QINIUACCESSKEY"
 # export QINIU_SK="QINIUSECRETKEY"
 # export QINIU_CDN_DOMAIN="cdn.example.com"
+# If you have more than one domain, just
+# export QINIU_CDN_DOMAIN="cdn1.example.com cdn2.example.com"
 
 QINIU_API_BASE="https://api.qiniu.com"
 
@@ -67,21 +69,23 @@ qiniu_deploy() {
   _debug certId "$_certId"
 
   ## update domain ssl config
-  update_path="/domain/$QINIU_CDN_DOMAIN/httpsconf"
   update_body="{\"certid\":$_certId,\"forceHttps\":false}"
-  update_access_token="$(_make_access_token "$update_path")"
-  _debug update_access_token "$update_access_token"
-  export _H1="Authorization: QBox $update_access_token"
-  update_response=$(_post "$update_body" "$QINIU_API_BASE$update_path" 0 "PUT" "application/json" | _dbase64 "multiline")
+  for domain in $QINIU_CDN_DOMAIN; do
+    update_path="/domain/$domain/httpsconf"
+    update_access_token="$(_make_access_token "$update_path")"
+    _debug update_access_token "$update_access_token"
+    export _H1="Authorization: QBox $update_access_token"
+    update_response=$(_post "$update_body" "$QINIU_API_BASE$update_path" 0 "PUT" "application/json" | _dbase64 "multiline")
 
-  if _contains "$update_response" "error"; then
-    _err "Error in updating domain httpsconf:"
-    _err "$update_response"
-    return 1
-  fi
+    if _contains "$update_response" "error"; then
+      _err "Error in updating domain $domain httpsconf:"
+      _err "$update_response"
+      return 1
+    fi
 
-  _debug update_response "$update_response"
-  _info "Certificate successfully deployed"
+    _debug update_response "$update_response"
+    _info "Domain $domain certificate has been deployed successfully"
+  done
 
   return 0
 }

From 34cebe8c0c1e08b25684e5b94535013087875519 Mon Sep 17 00:00:00 2001
From: netpok <netpok+github@gmail.com>
Date: Sun, 29 Mar 2020 23:45:52 +0200
Subject: [PATCH 16/17] Fix invalid domain error on dns_cf update

When dns_cf used with Zone ID it fails on removal of the entry.

This pull request adds the missing CF_Zone_ID loading.
---
 dnsapi/dns_cf.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dnsapi/dns_cf.sh b/dnsapi/dns_cf.sh
index 2927ab4b..040934e2 100755
--- a/dnsapi/dns_cf.sh
+++ b/dnsapi/dns_cf.sh
@@ -94,6 +94,7 @@ dns_cf_rm() {
 
   CF_Token="${CF_Token:-$(_readaccountconf_mutable CF_Token)}"
   CF_Account_ID="${CF_Account_ID:-$(_readaccountconf_mutable CF_Account_ID)}"
+  CF_Zone_ID="${CF_Zone_ID:-$(_readaccountconf_mutable CF_Zone_ID)}"
   CF_Key="${CF_Key:-$(_readaccountconf_mutable CF_Key)}"
   CF_Email="${CF_Email:-$(_readaccountconf_mutable CF_Email)}"
 

From ff9be30f869147428fb70fc08262a53ce8cac7f0 Mon Sep 17 00:00:00 2001
From: Xiaohui Lam <xiaohuilam@users.noreply.github.com>
Date: Tue, 31 Mar 2020 03:10:12 +0800
Subject: [PATCH 17/17] resolved #2818

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

diff --git a/acme.sh b/acme.sh
index f5e79ee8..aaab2104 100755
--- a/acme.sh
+++ b/acme.sh
@@ -4540,7 +4540,7 @@ $_authorizations_map"
     _savedomainconf "Le_LinkOrder" "$Le_LinkOrder"
 
     _link_cert_retry=0
-    _MAX_CERT_RETRY=5
+    _MAX_CERT_RETRY=30
     while [ "$_link_cert_retry" -lt "$_MAX_CERT_RETRY" ]; do
       if _contains "$response" "\"status\":\"valid\""; then
         _debug "Order status is valid."