From d5aa257de5555e33dd97baac1c4ca6212e3c2e36 Mon Sep 17 00:00:00 2001
From: Jim Hague <jim.hague@acm.org>
Date: Fri, 12 May 2023 10:08:45 +0100
Subject: [PATCH] havoc_website: add SSL redirect for cryhavoc.org.uk to
 www.cryhavoc.org.uk.

---
 states/havoc_website/cryhavoc.org.uk.conf | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/states/havoc_website/cryhavoc.org.uk.conf b/states/havoc_website/cryhavoc.org.uk.conf
index 0829de0..45742d1 100644
--- a/states/havoc_website/cryhavoc.org.uk.conf
+++ b/states/havoc_website/cryhavoc.org.uk.conf
@@ -2,7 +2,6 @@
 
 <VirtualHost *:443>
         ServerName www.cryhavoc.org.uk
-        ServerAlias cryhavoc.org.uk
 
         ErrorLog /var/log/apache2/cryhavoc-error.log
         CustomLog /var/log/apache2/cryhavoc-access.log combined
@@ -40,6 +39,27 @@
 	SSLCertificateKeyFile /var/local/certificates/cryhavoc.org.uk/privkey.pem
 </VirtualHost>
 
+<VirtualHost *:443>
+        ServerName cryhavoc.org.uk
+
+        ErrorLog /var/log/apache2/cryhavoc-error.log
+        CustomLog /var/log/apache2/cryhavoc-access.log combined
+
+        RemoteIPProxyProtocol On
+
+        <IfModule rewrite_module>
+                #
+                # This redirects all accesses to the HTTPS version of the site.
+                #
+                RewriteEngine On
+                RewriteRule ^/?(.*) https://www.cryhavoc.org.uk/$1 [R=301,L]
+        </IfModule>
+
+        SSLEngine on
+        SSLCertificateFile /var/local/certificates/cryhavoc.org.uk/fullchain.pem
+        SSLCertificateKeyFile /var/local/certificates/cryhavoc.org.uk/privkey.pem
+</VirtualHost>
+
 </IfModule>
 
 <VirtualHost *:80>