From b4e133bb39d6e304d135bd2d26ddf2774a87ce09 Mon Sep 17 00:00:00 2001
From: Monviech <79600909+Monviech@users.noreply.github.com>
Date: Tue, 10 Dec 2024 08:47:27 +0100
Subject: [PATCH] www/caddy: Fix redirect regression (#4390)

www/caddy: Fix redirect regression, always attach http to redir instead of empty default
---
 .../opnsense/service/templates/OPNsense/Caddy/Caddyfile  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/www/caddy/src/opnsense/service/templates/OPNsense/Caddy/Caddyfile b/www/caddy/src/opnsense/service/templates/OPNsense/Caddy/Caddyfile
index 90543e2fd..320eb8619 100644
--- a/www/caddy/src/opnsense/service/templates/OPNsense/Caddy/Caddyfile
+++ b/www/caddy/src/opnsense/service/templates/OPNsense/Caddy/Caddyfile
@@ -399,8 +399,13 @@ http://{{ domain }} {
         {% if handle.HandleDirective == "reverse_proxy" and handle.ToPath|default("") != "" %}
             rewrite * {{ handle.ToPath }}{uri}
         {% endif %}
-        {# http:// is the empty default #}
-        {% set protocol = 'https://' if handle.HttpTls == "1" else 'h2c://' if handle.HttpTls == "2" else '' -%}
+        {# http:// is the empty default for reverse_proxy #}
+        {% set protocol = (
+            "http://" if handle.HttpTls == "0" and handle.HandleDirective == "redir" else
+            "https://" if handle.HttpTls == "1" else
+            "h2c://" if handle.HttpTls == "2" else
+            ''
+        ) %}
         {% set formatted_domains = [] -%}
         {% for domain in handle.ToDomain.split(',') -%}
             {% set is_ipv6 = (':' in domain and domain.count(':') >= 2) -%}