From 81e5cdfea08dfc1b0dd3c744b3706b4252607b3d Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Tue, 21 Oct 2025 12:38:30 +0200
Subject: cover non-https vhost; slightly relax path patch

---
 apache2/conf-available/local-alias-redirect.conf | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'apache2')

diff --git a/apache2/conf-available/local-alias-redirect.conf b/apache2/conf-available/local-alias-redirect.conf
index e04fe29..0437d61 100644
--- a/apache2/conf-available/local-alias-redirect.conf
+++ b/apache2/conf-available/local-alias-redirect.conf
@@ -1,3 +1,6 @@
-<If "%{HTTP_HOST} != %{SERVER_NAME}">
-	RedirectMatch permanent ^(?!/.well-known/acme-challenge/)(.*) https://${_HOST}$1
-</If>
+	<IfDefine _TLS_HOST>
+	        RedirectMatch permanent ^(?!/.well-known/acme-challenge)(.*) https://${_HOST}$1
+	</IfDefine>
+	<IfDefine !_TLS_HOST>
+		RedirectMatch permanent ^(?!/.well-known/acme-challenge)(.*) http://${_HOST}$1
+	</IfDefine>
-- 
cgit v1.2.3