From 55b3fd14d308eb436a9ae1f10650d1ca3009f5d1 Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Mon, 13 May 2019 12:38:59 +0900
Subject: [PATCH] chg: [conf] Added http to https redirection

---
 INSTALL/apache.24.misp.ssl | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/INSTALL/apache.24.misp.ssl b/INSTALL/apache.24.misp.ssl
index b63e4b6b0..c6134fcbb 100644
--- a/INSTALL/apache.24.misp.ssl
+++ b/INSTALL/apache.24.misp.ssl
@@ -1,5 +1,23 @@
+<VirtualHost *:80>
+    ServerAdmin serveradmin@misp.local
+    ServerName misp.local
+
+    # In theory not needed, left for debug purposes
+    # LogLevel warn
+    # ErrorLog /var/log/apache2/misp.local_p80_error.log
+    # CustomLog /var/log/apache2/misp.local_p80_access.log combined
+
+    Header always unset "X-Powered-By"
+
+    RewriteEngine On
+    RewriteCond %{HTTPS}  !=on
+    RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
+
+    ServerSignature Off
+</VirtualHost>
+
 <VirtualHost *:443>
-    ServerAdmin me@me.local
+    ServerAdmin serveradmin@misp.local
     ServerName misp.local
     DocumentRoot /var/www/MISP/app/webroot
     <Directory /var/www/MISP/app/webroot>