taler-deployment

commit c4726ee70dc48c6d39deaa87f3fc4b212e02c610
parent 422b4485aefb67a02d7250f7da74ab74a4c0a12c
Author: Florian Dold <florian.dold@gmail.com>
Date:   Wed, 15 Mar 2017 12:55:54 +0100

nginx fixes

Diffstat:
M
etc/nginx/sites-enabled/demo.site
 | 
10
+---------
M
etc/nginx/sites-enabled/test.site
 | 
1
+
M
etc/nginx/sites-enabled/www-ssl.site
 | 
5
+++++

3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/etc/nginx/sites-enabled/demo.site b/etc/nginx/sites-enabled/demo.site
@@ -18,8 +18,7 @@ server {
   include conf.d/demo.redirects;
   include conf.d/talerssl;
   location / {
-    ssi on;
-    set $envroot "/";
+    rewrite ^/$ /en
     uwsgi_pass unix:/home/demo/sockets/landing.uwsgi;
     include /etc/nginx/uwsgi_params;
   }
@@ -73,8 +72,6 @@ server {
   include conf.d/talerssl;
 
   location / {
-    ssi on;
-    set $envroot "/";
     uwsgi_pass unix:/home/demo/sockets/shop.uwsgi;
     include /etc/nginx/uwsgi_params;
   }
@@ -98,8 +95,6 @@ server {
   include conf.d/talerssl;
 
   location / {
-    set $envroot "/";
-    ssi on;
     uwsgi_pass unix:/home/demo/sockets/donations.uwsgi;
     include /etc/nginx/uwsgi_params;
   }
@@ -120,7 +115,6 @@ server {
   listen 443 ssl;
   listen [::]:443 ssl;
   server_name bank.demo.taler.net;
-  ssi on;
   include conf.d/demo.redirects;
   include conf.d/talerssl;
 
@@ -130,8 +124,6 @@ server {
   }
 
   location / {
-    set $envroot "/";
-    ssi on;
     uwsgi_pass unix:/home/demo/sockets/bank.uwsgi;
     include /etc/nginx/uwsgi_params;
   }
diff --git a/etc/nginx/sites-enabled/test.site b/etc/nginx/sites-enabled/test.site
@@ -32,6 +32,7 @@ server {
     # https://www.nginx.com/resources/wiki/start/topics/depth/ifisevil/
     error_page 418 = @blue;
     error_page 419 = @green;
+    rewrite ^/$ /en redirect;
     recursive_error_pages on;
     if ($http_x_taler_deployment_color ~ "blue") { return 418; }
     if ($http_x_taler_deployment_color ~ "green") { return 419; }
diff --git a/etc/nginx/sites-enabled/www-ssl.site b/etc/nginx/sites-enabled/www-ssl.site
@@ -10,6 +10,11 @@ server {
 	include conf.d/talerssl;
 
         location = / {
+          map $http_accept_language $lang {
+            default en;
+            ~es es;
+            ~fr fr;
+          }
             rewrite_by_lua '
               if ngx.var.http_accept_language == nil then
                 ngx.redirect("/en/")