taler-deployment

commit 9a486cfb495366caf85c51f4f5db75956c6c4318
parent 383ae29bc23875addbadcba53fe92c5a978c8018
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date:   Thu, 10 Mar 2016 14:06:17 +0100

including redirects from shop-test*

Diffstat:
M
etc/nginx/sites-enabled/shop-test-ssl.site
 | 
5
++---
M
etc/nginx/sites-enabled/shop-test.site
 | 
5
+----

2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/etc/nginx/sites-enabled/shop-test-ssl.site b/etc/nginx/sites-enabled/shop-test-ssl.site
@@ -3,7 +3,7 @@ server {
  	# 	listen   [::]:80 default_server ipv6only=on; ## listen for ipv6
 
 	server_name shop.test.taler.net;
-
+	ssi on;
 	root /home/test/merchant/examples/shop/;
         index index.php;
 
@@ -49,6 +49,5 @@ server {
 	        proxy_redirect off;
 	        proxy_set_header Host $host;
 	}
-
-	rewrite ^/shop $scheme://shop.test.taler.net/ redirect;
+	include conf.d/test.redirects;
 }
diff --git a/etc/nginx/sites-enabled/shop-test.site b/etc/nginx/sites-enabled/shop-test.site
@@ -44,8 +44,5 @@ server {
 	        proxy_set_header Host $host;
 	}
 
-	rewrite ^/shop $scheme://shop.test.taler.net/ redirect;
-	rewrite ^/bank$ $scheme://bank.test.taler.net/ redirect;
-	rewrite ^/bank/public-accounts $scheme://bank.test.taler.net/public-accounts redirect;
-	rewrite ^/landing $scheme://test.taler.net/ redirect;
+	include conf.d/test.redirects;
 }