taler-deployment

commit ce8a4e1f9f6edb518d0bf06b6c6ad0429ab3e34b
parent 8527a86a83415789a6f6ece66f3d82eb0624b4f9
Author: Florian Dold <florian.dold@gmail.com>
Date:   Tue, 22 Nov 2016 14:28:31 +0100

test redirects

Diffstat:
M
etc/nginx/conf.d/test.redirects
 | 
2
++
M
etc/nginx/sites-enabled/test.site
 | 
10
++++------

2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/etc/nginx/conf.d/test.redirects b/etc/nginx/conf.d/test.redirects
@@ -5,3 +5,5 @@ rewrite ^/bank(.*)$ $scheme://bank.test.taler.net/$1 redirect;
 rewrite ^/exchange$ $scheme://exchange.demo.taler.net/ redirect;
 rewrite ^/exchange/(.*)$ $scheme://exchange.demo.taler.net/$1 redirect;
 rewrite ^/blog/track$ $scheme://blog.test.taler.net/track redirect;
+# relative redirect that works from anywhere in a URL.
+rewrite ^.*/redir_app_rel/(.*) /$1 redirect;
diff --git a/etc/nginx/sites-enabled/test.site b/etc/nginx/sites-enabled/test.site
@@ -17,8 +17,9 @@ server {
   rewrite /javascript /javascript.html break;
   include conf.d/test.redirects;
   include conf.d/talerssl;
-  rewrite ^.*/redir_app_rel/(.*) /$1 redirect;
   location / {
+    # SSI is okay here, since we only serve static content
+    # from landing
     ssi on;
     uwsgi_pass unix:/home/test/sockets/landing.uwsgi;
     include /etc/nginx/uwsgi_params;
@@ -58,7 +59,6 @@ server {
 
   location / {
     ssi on;
-    set $envroot "/";
     uwsgi_pass unix:/home/test/sockets/shop.uwsgi;
     include /etc/nginx/uwsgi_params;
   }
@@ -72,13 +72,13 @@ server {
   include conf.d/favicon_robots;
 }
 
+
 server {
   listen 443 ssl;
   listen 80;
   listen [::]:443 ssl;
   listen [::]:80;
   server_name backend.test.taler.net;
-  include conf.d/test.redirects;
   include conf.d/talerssl;
 
   location / {
@@ -88,6 +88,7 @@ server {
   }
 }
 
+
 server {
   listen 443 ssl;
   listen [::]:443 ssl;
@@ -97,12 +98,10 @@ server {
 
   location / {
     ssi on;
-    set $envroot "/";
     uwsgi_pass unix:/home/test/sockets/donations.uwsgi;
     include /etc/nginx/uwsgi_params;
   }
 
-
   location /backend {
     rewrite /backend/(.*) /$1 break;
     proxy_pass http://unix:/home/test/sockets/merchant.http:/;
@@ -127,7 +126,6 @@ server {
 
   location / {
     ssi on;
-    set $envroot "/";
     uwsgi_pass unix:/home/test/sockets/bank.uwsgi;
     include /etc/nginx/uwsgi_params;
   }