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 @@ 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 + + ServerName cryhavoc.org.uk + + ErrorLog /var/log/apache2/cryhavoc-error.log + CustomLog /var/log/apache2/cryhavoc-access.log combined + + RemoteIPProxyProtocol On + + + # + # This redirects all accesses to the HTTPS version of the site. + # + RewriteEngine On + RewriteRule ^/?(.*) https://www.cryhavoc.org.uk/$1 [R=301,L] + + + SSLEngine on + SSLCertificateFile /var/local/certificates/cryhavoc.org.uk/fullchain.pem + SSLCertificateKeyFile /var/local/certificates/cryhavoc.org.uk/privkey.pem + +