From 9a6025a3f169053b7784f90e92a7c95c17bbf72b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Wed, 24 Jun 2015 20:07:59 +0200
Subject: [PATCH] Localhost

---
 .htaccess        | 4 ++--
 server/server.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.htaccess b/.htaccess
index fbb84555..105d8c48 100755
--- a/.htaccess
+++ b/.htaccess
@@ -5,8 +5,8 @@ RewriteCond %{HTTP_HOST} ^www\.(.*)$ [NC]
 RewriteRule ^(.*)$ http://%1/$1 [R=301,L]
 
 #Comment out the two folling lines when running server locally to fix issues with localhost
-#RewriteCond %{HTTPS} !=on
-#RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
+RewriteCond %{HTTPS} !=on
+RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
 
 
 RewriteRule ^remote/(.*) php/controller.php?id=$1 [L]
diff --git a/server/server.js b/server/server.js
index 3d82d056..53f8a6f2 100755
--- a/server/server.js
+++ b/server/server.js
@@ -4,7 +4,7 @@ var server;
 This if for the localhost running
 
 ******/
-localhost = true;
+localhost = false;
 
 //https server
 if(localhost)