From 92036bec4332efe373ed43ae24a6e50cdcd0d86c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Mon, 22 Feb 2016 15:14:13 +0100
Subject: [PATCH] more https

---
 .htaccess | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.htaccess b/.htaccess
index c0cf9049..a012614a 100755
--- a/.htaccess
+++ b/.htaccess
@@ -2,8 +2,12 @@ Options +FollowSymLinks
 RewriteEngine on
 RewriteBase /
 RewriteCond %{HTTP_HOST} ^www\.(.*)$ [NC]
+RewriteCond %{HTTPS} !=on
 RewriteRule ^(.*)$ https://%1/$1 [L]
 
+RewriteCond %{HTTPS} !=on
+RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [L]
+
 RewriteCond %{HTTP_HOST} ^remote.zoff.no
 RewriteCond %{REQUEST_URI} !/static
 RewriteRule ^(.*)$ php/controller.php [L,NC,QSA]