From 900711c30c49aa8aa7d99e7cc749bb44037da452 Mon Sep 17 00:00:00 2001 From: Nathan Samson <nathan@nathansamson.be> Date: Sat, 23 Nov 2024 12:01:11 +0100 Subject: [PATCH 1/4] letsencrypt Addon: Fix issue 3606. Add transip global_key parameter --- letsencrypt/rootfs/etc/cont-init.d/file-structure.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/letsencrypt/rootfs/etc/cont-init.d/file-structure.sh b/letsencrypt/rootfs/etc/cont-init.d/file-structure.sh index 42c5c1390dc..12df823e7e8 100755 --- a/letsencrypt/rootfs/etc/cont-init.d/file-structure.sh +++ b/letsencrypt/rootfs/etc/cont-init.d/file-structure.sh @@ -61,6 +61,7 @@ echo -e "dns_desec_token = $(bashio::config 'dns.desec_token')\n" \ "dns_sakuracloud_api_token = $(bashio::config 'dns.sakuracloud_api_token')\n" \ "dns_sakuracloud_api_secret = $(bashio::config 'dns.sakuracloud_api_secret')\n" \ "dns_transip_username = $(bashio::config 'dns.transip_username')\n" \ + "dns_transip_global_key = $(bashio::config 'dns.transip_global_key')\n" \ "dns_transip_key_file = /data/transip-rsa.key\n" \ "dns_inwx_url = https://api.domrobot.com/xmlrpc/\n" \ "dns_inwx_username = $(bashio::config 'dns.inwx_username')\n" \ From 3a53f5a9a754c4dbed3937a22f504f0ec53b7bf2 Mon Sep 17 00:00:00 2001 From: Nathan Samson <nathan@nathansamson.be> Date: Sat, 23 Nov 2024 12:09:30 +0100 Subject: [PATCH 2/4] Add documentation --- letsencrypt/DOCS.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/letsencrypt/DOCS.md b/letsencrypt/DOCS.md index 02ae30d4c09..9e70d6d6f43 100644 --- a/letsencrypt/DOCS.md +++ b/letsencrypt/DOCS.md @@ -146,6 +146,7 @@ gandi_token: '' gandi_sharing_id: '' transip_username: '' transip_api_key: '' +transip_global_key: '' inwx_username: '' inwx_password: '' inwx_shared_secret: '' @@ -646,6 +647,8 @@ Example configuration: You will need to generate an API key from the TransIP Control Panel at https://www.transip.nl/cp/account/api/. +If you can't use IP whitelisting, use the `transip_global_key` and set it to yes. (https://github.com/hsmade/certbot-dns-transip/blob/master/USAGE.rst#ip-whitelistsing) + The propagation limit will be automatically raised to 240 seconds. Example configuration: From 4d5b9d160747504585da5c2ac1ebce6b264bc814 Mon Sep 17 00:00:00 2001 From: Nathan Samson <nathan@nathansamson.be> Date: Tue, 3 Dec 2024 19:09:01 +0100 Subject: [PATCH 3/4] Code review comments --- letsencrypt/CHANGELOG.md | 4 ++++ letsencrypt/DOCS.md | 2 +- letsencrypt/config.yaml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/letsencrypt/CHANGELOG.md b/letsencrypt/CHANGELOG.md index 5a1be9d1dbe..c93eaa24d3e 100644 --- a/letsencrypt/CHANGELOG.md +++ b/letsencrypt/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 5.2.8 + +- Add transip global_key parameter + ## 5.2.7 - Add mijn.host DNS support diff --git a/letsencrypt/DOCS.md b/letsencrypt/DOCS.md index 5b13b56caa4..2d914b83588 100644 --- a/letsencrypt/DOCS.md +++ b/letsencrypt/DOCS.md @@ -679,7 +679,7 @@ Example configuration: You will need to generate an API key from the TransIP Control Panel at https://www.transip.nl/cp/account/api/. -If you can't use IP whitelisting, use the `transip_global_key` and set it to yes. (https://github.com/hsmade/certbot-dns-transip/blob/master/USAGE.rst#ip-whitelistsing) +If you can't use IP whitelisting, set the `transip_global_key` parameter to `'yes'`. See [Certbot TransIP DNS plugin documentation](https://github.com/hsmade/certbot-dns-transip/blob/master/USAGE.rst#ip-whitelistsing) for more details. The propagation limit will be automatically raised to 240 seconds. diff --git a/letsencrypt/config.yaml b/letsencrypt/config.yaml index 7ca738a1074..c65f30cd26b 100644 --- a/letsencrypt/config.yaml +++ b/letsencrypt/config.yaml @@ -1,5 +1,5 @@ --- -version: 5.2.7 +version: 5.2.8 slug: letsencrypt name: Let's Encrypt description: Manage certificate from Let's Encrypt From 37641dacb62850f2f8375a1ccab8207594098001 Mon Sep 17 00:00:00 2001 From: Nathan Samson <nathan@nathansamson.be> Date: Tue, 3 Dec 2024 19:13:19 +0100 Subject: [PATCH 4/4] Update CHANGELOG.md --- letsencrypt/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/letsencrypt/CHANGELOG.md b/letsencrypt/CHANGELOG.md index c93eaa24d3e..ea494c5fd4f 100644 --- a/letsencrypt/CHANGELOG.md +++ b/letsencrypt/CHANGELOG.md @@ -2,7 +2,7 @@ ## 5.2.8 -- Add transip global_key parameter +- Add transip global_key parameter to support authentication without IP whitelist requirements ## 5.2.7