letsencrypt: fix TransIP global_key handling

* follow-up to #3862 Co-authored-by: Goopher <goopher@live.nl>
home-assistant · Feb 28, 2025 · f9d4f79 · f9d4f79
1 parent 1ca5f12
commit f9d4f79
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/letsencrypt/CHANGELOG.md b/letsencrypt/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 5.4.1
+
+- Fix TransIP global_key handling
+
 ## 5.4.0
 
 - Add additional arguments to certbot (dry-run, test-cert, verbose)

diff --git a/letsencrypt/config.yaml b/letsencrypt/config.yaml
@@ -1,5 +1,5 @@
 ---
-version: 5.4.0
+version: 5.4.1
 breaking_versions: [5.3.0]
 slug: letsencrypt
 name: Let's Encrypt

diff --git a/letsencrypt/rootfs/etc/cont-init.d/file-structure.sh b/letsencrypt/rootfs/etc/cont-init.d/file-structure.sh
@@ -80,7 +80,6 @@ echo -e "aws_access_key_id = $(bashio::config 'dns.aws_access_key_id')\n" \
       "dns_sakuracloud_api_token = $(bashio::config 'dns.sakuracloud_api_token')\n" \
       "dns_simply_account_name = $(bashio::config 'dns.simply_account_name')\n" \
       "dns_simply_api_key = $(bashio::config 'dns.simply_api_key')\n" \
-      "dns_transip_global_key = $(bashio::config 'dns.transip_global_key')\n" \
       "dns_transip_key_file = /data/transip-rsa.key\n" \
       "dns_transip_username = $(bashio::config 'dns.transip_username')\n" \
       "dns_websupport_identifier = $(bashio::config 'dns.websupport_identifier')\n" \
@@ -109,6 +108,11 @@ if bashio::config.exists 'dns.transip_api_key'; then
       chmod 600 /data/transip-rsa.key
 fi
 
+# TransIP global_key conditional write out to config 
+if bashio::config.exists 'dns.transip_global_key'; then
+      echo -e "dns_transip_global_key = $(bashio::config 'dns.transip_global_key')\n" >> "/data/dnsapikey"
+fi
+
 # Cleanup removed add-on options
 if bashio::config.exists 'dns.cloudxns_api_key'; then
       bashio::addon.option 'dns.cloudxns_api_key'

diff --git a/letsencrypt/rootfs/etc/services.d/lets-encrypt/run b/letsencrypt/rootfs/etc/services.d/lets-encrypt/run
@@ -275,11 +275,8 @@ elif [ "${CHALLENGE}" == "dns" ] && [ "${DNS_PROVIDER}" == "dns-simply" ]; then
 elif [ "${CHALLENGE}" == "dns" ] && [ "${DNS_PROVIDER}" == "dns-transip" ]; then
     bashio::config.require 'dns.transip_username'
     bashio::config.require 'dns.transip_api_key'
-    if bashio::config.has_value 'dns.transip_global_key'; then
-    "dns_transip_global_key=$(bashio::config 'dns.transip_global_key')"
-    fi
     if (( PROPAGATION_SECONDS < 240 )); then
-        bashio::log.info "Increasing DNS propagation limit for TransIP to at least 240 seconds."
+        bashio::log.info "Increasing DNS propagation time for TransIP to at least 240 seconds."
         PROPAGATION_SECONDS=240
     fi
     PROVIDER_ARGUMENTS+=("--authenticator" "${DNS_PROVIDER}" "--${DNS_PROVIDER}-credentials" "/data/dnsapikey" "--${DNS_PROVIDER}-propagation-seconds" "${PROPAGATION_SECONDS}")