From acdcd7fb26759c60e4c93bde886bed50e36e674c Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Fri, 4 Mar 2016 17:04:49 +0100
Subject: make landing page https

---
 etc/nginx/sites-enabled/demo.site | 10 +---------
 etc/nginx/sites-enabled/test.site |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'etc/nginx')

diff --git a/etc/nginx/sites-enabled/demo.site b/etc/nginx/sites-enabled/demo.site
index f08f8cd..a9b771d 100644
--- a/etc/nginx/sites-enabled/demo.site
+++ b/etc/nginx/sites-enabled/demo.site
@@ -3,18 +3,10 @@ server {
  	# 	listen   [::]:80 default_server ipv6only=on; ## listen for ipv6
 
 	root /home/demo/landing/;
-        index index.html;
 
 	# Make site accessible from http://localhost/
 	server_name demo.taler.net;
 	server_name www.demo.taler.net;
 
-	rewrite ^/bank $scheme://bank.demo.taler.net/ redirect;
-	rewrite ^/shop $scheme://shop.demo.taler.net/ redirect;
-
-        location ~ \.php$ {
-            fastcgi_pass unix:/var/run/php5-fpm.sock;
-            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            include fastcgi_params;
-        }
+	rewrite ^ https://$server_name$request_uri? permanent;
 }
diff --git a/etc/nginx/sites-enabled/test.site b/etc/nginx/sites-enabled/test.site
index 1a277c6..68a0674 100644
--- a/etc/nginx/sites-enabled/test.site
+++ b/etc/nginx/sites-enabled/test.site
@@ -1,6 +1,6 @@
 server {
   listen 80;
-  include sites-enabled/test;
+  rewrite ^ https://$server_name$request_uri? permanent;
 }
 server {
   listen 443 ssl;
-- 
cgit v1.2.3