# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1723371365 -3600
# Node ID 28d327443c45d4958c79d4d367aa56a0f97f8fa0
# Parent  9437c6ffa07c886c58a9cfaa2c3db7c11044b820
Keep host on redir to HTTPS to fix HSTS

Apparently it doesn't apply if you redirect from http with no-www
to https with www (or vice versa)

diff -r 9437c6ffa07c -r 28d327443c45 modules/website/manifests/https.pp
--- a/modules/website/manifests/https.pp	Sat May 25 18:31:52 2024 +0100
+++ b/modules/website/manifests/https.pp	Sun Aug 11 11:16:05 2024 +0100
@@ -143,7 +143,9 @@
   $redir_fragment = "
 	# Filter before we redirect to HTTPS
 	Include conf.custom/filter-core.conf
-	Redirect permanent / https://$name/"
+	<Location />
+		Redirect permanent https://%{HTTP_HOST}%{REQUEST_URI}
+	</Location>"
 
 
   apache::vhost { $name: