From 68a69f0c880230dc968a11dd47e0d3e8b3540f44 Mon Sep 17 00:00:00 2001
From: Monviech <79600909+Monviech@users.noreply.github.com>
Date: Wed, 10 Jul 2024 10:19:13 +0200
Subject: [PATCH] www/caddy: Update route53 config field names (#4073)

Reference: https://github.com/caddy-dns/route53/commit/19e2b6c
---
 www/caddy/pkg-descr                                           | 1 +
 .../mvc/app/controllers/OPNsense/Caddy/forms/dnsprovider.xml  | 4 ++--
 .../service/templates/OPNsense/Caddy/includeDnsProvider       | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/www/caddy/pkg-descr b/www/caddy/pkg-descr
index 7aa3e1d4a..94e47d2bd 100644
--- a/www/caddy/pkg-descr
+++ b/www/caddy/pkg-descr
@@ -34,6 +34,7 @@ Plugin Changelog
 * Add: Introduce HTTP version to handler. HTTP/1.1, HTTP/2 and HTTP/3 can be chosen.
 * Add: HTTP Keepalive can be set in a handler.
 * Change: Option "tls_trusted_ca_certs" is now "tls_trust_pool".
+* Build: Update caddy-dns Cloudflare and Route53. Route53 field names changed due to upstream changes.
 * Add: TLS can be deactivated in a domain.
 
 1.5.7
diff --git a/www/caddy/src/opnsense/mvc/app/controllers/OPNsense/Caddy/forms/dnsprovider.xml b/www/caddy/src/opnsense/mvc/app/controllers/OPNsense/Caddy/forms/dnsprovider.xml
index 39d36919c..87fedb3ca 100644
--- a/www/caddy/src/opnsense/mvc/app/controllers/OPNsense/Caddy/forms/dnsprovider.xml
+++ b/www/caddy/src/opnsense/mvc/app/controllers/OPNsense/Caddy/forms/dnsprovider.xml
@@ -32,7 +32,7 @@
         <id>caddy.general.TlsDnsOptionalField2</id>
         <label>DNS API Additional Field 3</label>
         <type>text</type>
-        <help><![CDATA[Leave empty if your DNS Provider isn't specified here. Field can be left empty if optional: Route53 "aws_profile", ACME-DNS "server_url", Azure "subscription_id", OVH "consumer_key", Namecheap "client_ip", DDNS "password", INWX "endpoint_url", DirectAdmin "insecure_requests", RFC2136 "server".]]></help>
+        <help><![CDATA[Leave empty if your DNS Provider isn't specified here. Field can be left empty if optional: Route53 "profile", ACME-DNS "server_url", Azure "subscription_id", OVH "consumer_key", Namecheap "client_ip", DDNS "password", INWX "endpoint_url", DirectAdmin "insecure_requests", RFC2136 "server".]]></help>
     </field>
     <field>
         <id>caddy.general.TlsDnsOptionalField3</id>
@@ -44,6 +44,6 @@
         <id>caddy.general.TlsDnsOptionalField4</id>
         <label>DNS API Additional Field 5</label>
         <type>text</type>
-        <help><![CDATA[Leave empty if your DNS Provider isn't specified here. Field can be left empty if optional: Route53 "token".]]></help>
+        <help><![CDATA[Leave empty if your DNS Provider isn't specified here. Field can be left empty if optional: Route53 "session_token".]]></help>
     </field>
 </form>
diff --git a/www/caddy/src/opnsense/service/templates/OPNsense/Caddy/includeDnsProvider b/www/caddy/src/opnsense/service/templates/OPNsense/Caddy/includeDnsProvider
index f962d7512..94df27ca0 100644
--- a/www/caddy/src/opnsense/service/templates/OPNsense/Caddy/includeDnsProvider
+++ b/www/caddy/src/opnsense/service/templates/OPNsense/Caddy/includeDnsProvider
@@ -26,11 +26,11 @@
     {% endif %}
     {% if dnsOptionalField1 %}max_retries {{ dnsOptionalField1 }}
     {% endif %}
-    {% if dnsOptionalField2 %}aws_profile {{ dnsOptionalField2 }}
+    {% if dnsOptionalField2 %}profile {{ dnsOptionalField2 }}
     {% endif %}
     {% if dnsOptionalField3 %}region {{ dnsOptionalField3 }}
     {% endif %}
-    {% if dnsOptionalField4 %}token {{ dnsOptionalField4 }}
+    {% if dnsOptionalField4 %}session_token {{ dnsOptionalField4 }}
     {% endif %}
 {% elif dnsProvider == 'acmedns' %}
     {% if dnsApiKey %}username {{ dnsApiKey }}