From 4f633eab8e5d6172ce1beb6ee711bb522d53dad4 Mon Sep 17 00:00:00 2001
From: mwiegand <mwiegand@seibert-media.net>
Date: Sat, 6 Nov 2021 15:16:46 +0100
Subject: [PATCH] wip

---
 bundles/letsencrypt/files/hook.sh | 48 ++++++++++---------------------
 1 file changed, 15 insertions(+), 33 deletions(-)

diff --git a/bundles/letsencrypt/files/hook.sh b/bundles/letsencrypt/files/hook.sh
index 9b9eeb1..50845b0 100644
--- a/bundles/letsencrypt/files/hook.sh
+++ b/bundles/letsencrypt/files/hook.sh
@@ -1,43 +1,25 @@
+set -e
+set -u
+set -o pipefail
+
 deploy_challenge() {
-  set -e
-  set -u
-  set -o pipefail
-  
-  ACME_ZONE=${zone}
-  SERVER=${server}
-  DOMAIN=$1
-  CHALLENGE=$3
-  KEY=hmac-sha512:acme.sublimity.de:${acme_key}
-  cmd="
-    server $SERVER
-    zone $ACME_ZONE.
-    update add $DOMAIN.$ACME_ZONE. 60 IN TXT \"$CHALLENGE\"
+  echo "
+    server ${server}
+    zone ${zone}.
+    update add $1.${zone}. 60 IN TXT \"$3\"
     send
-  "
-  echo "$cmd"
-  echo "$cmd" | nsupdate -y $KEY
+  " | tee | nsupdate -y hmac-sha512:acme.sublimity.de:${acme_key}
   
-  sleep 15
+  sleep 10
 }
 
 clean_challenge() {
-  set -e
-  set -u
-  set -o pipefail
-  
-  ACME_ZONE=${zone}
-  SERVER=${server}
-  DOMAIN=$1
-  CHALLENGE=$3
-  KEY=hmac-sha512:acme.sublimity.de:${acme_key}
-  cmd="
-    server $SERVER
-    zone $ACME_ZONE.
-    update delete $DOMAIN.$ACME_ZONE. TXT
+  echo "
+    server ${server}
+    zone ${zone}.
+    update delete $1.${zone}. TXT
     send
-  "
-  echo "$cmd"
-  echo "$cmd" | nsupdate -y $KEY
+  " | tee | nsupdate -y hmac-sha512:acme.sublimity.de:${acme_key}
 }
 
 deploy_cert() {<%text>