From f3532fc9d878e1f8b13dd0b6242f2ee6918b9b72 Mon Sep 17 00:00:00 2001
From: Monviech <79600909+Monviech@users.noreply.github.com>
Date: Tue, 21 May 2024 16:34:19 +0200
Subject: [PATCH] www/caddy: Caddy dyndns wildcard domain fix (#3989)

- wildcard domains like "*.example.com" need the following dns update:
example.com *
- base domains like "example.com" need the following dns update:
example.com @
---
 www/caddy/pkg-descr                                         | 4 ++++
 .../src/opnsense/service/templates/OPNsense/Caddy/Caddyfile | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/www/caddy/pkg-descr b/www/caddy/pkg-descr
index 1501aed1a..ea38afb12 100644
--- a/www/caddy/pkg-descr
+++ b/www/caddy/pkg-descr
@@ -26,6 +26,10 @@ DOC: https://docs.opnsense.org/manual/how-tos/caddy.html
 Plugin Changelog
 ================
 
+1.5.6
+
+* Fix: Wildcard domains with activated "Dynamic DNS" update their base domain with * instead of @.
+
 1.5.5
 
 * Fix: "Apply" could hang when websockets are in use by clients. A grace period of 10s has been added in General Settings that forces to close all connections on config changes.
diff --git a/www/caddy/src/opnsense/service/templates/OPNsense/Caddy/Caddyfile b/www/caddy/src/opnsense/service/templates/OPNsense/Caddy/Caddyfile
index 7c9f7ed9d..76e5a6d27 100644
--- a/www/caddy/src/opnsense/service/templates/OPNsense/Caddy/Caddyfile
+++ b/www/caddy/src/opnsense/service/templates/OPNsense/Caddy/Caddyfile
@@ -123,7 +123,11 @@
     {% for reverse in helpers.toList('Pischem.caddy.reverseproxy.reverse') %}
         {% if reverse.enabled|default("0") == "1" and reverse.DynDns|default("0") == "1" %}
             {% set cleanedDomain = reverse.FromDomain | replace("*.","") %}
-            {% do dynDnsDomains.append(cleanedDomain + " @") %}
+            {% if reverse.FromDomain.startswith("*.") %}
+                {% do dynDnsDomains.append(cleanedDomain + " *") %}
+            {% else %}
+                {% do dynDnsDomains.append(cleanedDomain + " @") %}
+            {% endif %}
         {% endif %}
 
         {% for subdomain in helpers.toList('Pischem.caddy.reverseproxy.subdomain') %}