taler-deployment

commit f6bde4ef887a00d68ffa1b08aba3ad8820e68df8
parent ffa831c3d4b3e86eaee46c4a694b2e682f599b0a
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date:   Tue, 14 Feb 2017 14:30:18 +0100

Merge branch 'master' of taler.net:deployment

Diffstat:
M
etc/nginx/sites-enabled/env.site
 | 
2
+-
M
etc/nginx/sites-enabled/www-ssl.site
 | 
14
++++----------

2 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/etc/nginx/sites-enabled/env.site b/etc/nginx/sites-enabled/env.site
@@ -60,7 +60,7 @@ server {
   }
 
   location ~ ^/(?<user>[a-zA-Z0-9-_]+)/donations(?<req>/.*|)$ {
-    uwsgi_pass unix:/home/$user/sockets/shop.uwsgi;
+    uwsgi_pass unix:/home/$user/sockets/donations.uwsgi;
     include /etc/nginx/uwsgi_params;
     uwsgi_param SCRIPT_NAME "/$user/donations/";
     uwsgi_param PATH_INFO "$req";
diff --git a/etc/nginx/sites-enabled/www-ssl.site b/etc/nginx/sites-enabled/www-ssl.site
@@ -45,18 +45,12 @@ server {
 
 	    rewrite ^/$ /en/ redirect;
 
-	    rewrite ^/(..)/(index)?$ /index.$1.html break;
-	    rewrite ^/(..)/(citizens)$ /$2.$1.html break;
-	    rewrite ^/(..)/(developers)$ /$2.$1.html break;
-	    rewrite ^/(..)/(merchants)$ /$2.$1.html break;
-	    rewrite ^/(..)/(governments)$ /$2.$1.html break;
-	    rewrite ^/(..)/(investors)$ /$2.$1.html break;
-	    rewrite ^/(..)/(about)$ /$2.$1.html break;
-	    rewrite ^/(..)/(news)$ /$2.$1.html break;
-	    rewrite ^/(..)/(wallet)$ /$2.$1.html break;
+	    rewrite ^/(..)/$ /$1/index.html break;
 
 	    rewrite ^/(help/empty-wallet)$ /$1.html break;
-	    rewrite ^/wallet-installation\.html$ /wallet.en.html permanent;
+	    rewrite ^/wallet-installation\.html$ /en/wallet.html redirect;
+            # just to get around cached old redirect
+	    rewrite ^/wallet\.en\.html$ /en/wallet.html redirect;
 	}
 
         gzip on;