# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1716318905 -3600
# Node ID 73e28468a543babee1a2516cd8ce05bd335c4599
# Parent  65290cb0cec23185ca9c922dfa56ebc65d79b544
Fix HTTP on IPv6

We don't need the remote IP instruction on both redirects,
just on the IPv4-to-6 proxy redirect

diff -r 65290cb0cec2 -r 73e28468a543 modules/website/manifests/https.pp
--- a/modules/website/manifests/https.pp	Sun May 12 19:51:53 2024 +0100
+++ b/modules/website/manifests/https.pp	Tue May 21 20:15:05 2024 +0100
@@ -140,10 +140,10 @@
     $group = $docroot_group
   }
 
-  $redir_fragment = "RemoteIPProxyProtocol On
-# Filter before we redirect to HTTPS
-Include conf.custom/filter-core.conf
-Redirect permanent / https://$name/"
+  $redir_fragment = "
+	# Filter before we redirect to HTTPS
+	Include conf.custom/filter-core.conf
+	Redirect permanent / https://$name/"
 
 
   apache::vhost { $name:
@@ -209,7 +209,7 @@
       port => 80,
       docroot => $siteroot,
       serveraliases   => $serveraliases,
-      custom_fragment => $redir_fragment,
+      custom_fragment => "RemoteIPProxyProtocol On\n$redir_fragment",
       logroot         => '/var/log/apache/',
       access_log_file => "access_${logpart}_80.log",
       access_log_format => "%a %l %u %t \\\"%r\\\" %>s %b \\\"%{Referer}i\\\" \\\"%{User-agent}i\\\" %{Host}i",