From 2c4e372109bf59184bf569e122fc59c59fb57512 Mon Sep 17 00:00:00 2001
From: Monviech <79600909+Monviech@users.noreply.github.com>
Date: Tue, 2 Sep 2025 09:52:37 +0200
Subject: [PATCH] www/caddy: Fix subdomain http access log (#4919)

* www/caddy: Emit subdomain http access logs in the same log collector as their wildcard parent

* add changelog
---
 www/caddy/pkg-descr                                             | 1 +
 .../src/opnsense/service/templates/OPNsense/Caddy/Caddyfile     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/caddy/pkg-descr b/www/caddy/pkg-descr
index d03ab0887..2c24dd7ff 100644
--- a/www/caddy/pkg-descr
+++ b/www/caddy/pkg-descr
@@ -12,6 +12,7 @@ Add: Tabulator groupBy of domain and subdomain (opnsense/plugins/pull/4909)
 Cleanup: Grid HTML and style
 Fix: Tabulator 'Data Load Response Blocked' warning
 Fix: setup.sh interaction with caddy storage and permissions (opnsense/plugins/pull/4911)
+Fix: Emit subdomain http access logs when wildcard parent has logging enabled (opnsense/plugins/issues/4914)
 
 2.0.2
 
diff --git a/www/caddy/src/opnsense/service/templates/OPNsense/Caddy/Caddyfile b/www/caddy/src/opnsense/service/templates/OPNsense/Caddy/Caddyfile
index c16989068..e7c7168e9 100644
--- a/www/caddy/src/opnsense/service/templates/OPNsense/Caddy/Caddyfile
+++ b/www/caddy/src/opnsense/service/templates/OPNsense/Caddy/Caddyfile
@@ -647,7 +647,7 @@ http://{{ domain }} {
             {% if reverse.DisableTls|default("0") == "1" %}http://{% endif %}{{ subdomain.FromDomain|default("") }}{% if reverse.FromPort %}:{{ reverse.FromPort }}{% endif %} {
                 {% if reverse.AccessLog|default("0") == "1" %}
                     {% if generalSettings.LogAccessPlain|default("0") == "0" %}
-                        log {{ subdomain['@uuid'] }}
+                        log {{ reverse['@uuid'] }}
                     {% else %}
                         log {
                             output file /var/log/caddy/access/{{ subdomain['@uuid'] }}.log {