upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-04-27 17:21:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

www/caddy: Fix HTTP access log excluding the process logs accidentally (#4974)

Browse source 
When using "include" in the default global logger, all other logs get excluded, except those that get included.

Using a "log default" instead, sends the HTTP access logs to the default logger.

This allows process and HTTP access logs to coexist in the same logger.
This commit is contained in:
Monviech 2025-10-10 16:05:31 +02:00 committed by GitHub
parent 6a6f5aedef
commit bcd2deb43e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
www/caddy/src/opnsense/service/templates/OPNsense/Caddy/Caddyfile
View file

@ -43,13 +43,6 @@
# with the syslog-ng instance running on the OPNsense.
#}
log {
{% if generalSettings.LogAccessPlain|default("0") == "0" %}
{% for reverse in helpers.toList('Pischem.caddy.reverseproxy.reverse') %}
{% if reverse.enabled|default("0") == "1" and reverse.AccessLog|default("0") == "1" %}
include http.log.access.{{ reverse['@uuid'] }}
{% endif %}
{% endfor %}
{% endif %}
output net unixgram//var/run/caddy/log.sock {
}
format json {
@ -614,7 +607,7 @@ http://{{ domain }} {
{% if reverse.DisableTls|default("0") == "1" %}http://{% endif %}{{ reverse.FromDomain|default("") }}{% if reverse.FromPort %}:{{ reverse.FromPort }}{% endif %} {
{% if reverse.AccessLog|default("0") == "1" %}
{% if generalSettings.LogAccessPlain|default("0") == "0" %}
log {{ reverse['@uuid'] }}
log default
{% else %}
log {
output file /var/log/caddy/access/{{ reverse['@uuid'] }}.log {
@ -652,7 +645,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 {{ reverse['@uuid'] }}
log default
{% else %}
log {
output file /var/log/caddy/access/{{ subdomain['@uuid'] }}.log {