taler-deployment

commit d15222de2e82642a1a118d138613f53cf76cb9c6
parent cecf8dbc78f654d4f4b9742ffc8193f911704a0c
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date:   Sat, 19 Nov 2016 16:56:13 +0100

Merge branch 'master' of taler.net:deployment

Diffstat:
M
etc/nginx/conf.d/demo.redirects
 | 
1
+
M
etc/nginx/conf.d/test.redirects
 | 
1
+
M
etc/nginx/sites-enabled/www-ssl.site
 | 
16
++++++++++++++++

3 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/etc/nginx/conf.d/demo.redirects b/etc/nginx/conf.d/demo.redirects
@@ -4,3 +4,4 @@
 	rewrite ^/bank(.*)$ $scheme://bank.demo.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.demo.taler.net/track redirect;
diff --git a/etc/nginx/conf.d/test.redirects b/etc/nginx/conf.d/test.redirects
@@ -4,3 +4,4 @@
 	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;
diff --git a/etc/nginx/sites-enabled/www-ssl.site b/etc/nginx/sites-enabled/www-ssl.site
@@ -26,9 +26,25 @@ server {
 	    rewrite ^/wallet$ /wallet.html break;
 	}
 
+        gzip on;
+        gzip_disable "msie6";
+        gzip_vary on;
+        gzip_proxied any;
+        gzip_comp_level 6;
+        gzip_buffers 16 8k;
+        gzip_http_version 1.1;
+        gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript application/javascript;
+
+
+        location ~* \.(png|jpg|jpeg|gif|ico|svg|js|css)$ {
+	    root /var/www/taler.net;
+            expires 1y;
+        }
+
 	# Note: this will go to /var/www/(videos|releases), which we took out of Git
 	location /videos {
 	    root /var/www;
+            expires max;
 	}
 
 	location /releases {