taler-deployment

commit 46e17e70f5d5797ded3635dd73f9aa6e0275ffc3
parent 74bb638f83e84f648bb300d01cd09a4f047bb568
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date:   Wed, 15 Feb 2017 17:24:54 +0100

Merge branch 'master' of taler.net:deployment

Diffstat:
M
etc/nginx/sites-enabled/www-ssl.site
 | 
17
++++++++++++-----

1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/etc/nginx/sites-enabled/www-ssl.site b/etc/nginx/sites-enabled/www-ssl.site
@@ -63,17 +63,17 @@ server {
         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 ~* /videos/.*\.(png|jpg|ogv|webm|gif|svg)$ {
+            root /var/www;
+            expires max;
+        }
+
 	location /releases {
 	    root /var/www;
 	    autoindex on;
@@ -82,4 +82,11 @@ server {
 	location /files {
 	    root /var/www;
 	}
+
+        location ~* \.(png|jpg|jpeg|gif|ico|svg|js|css)$ {
+	    root /var/www/taler.net;
+            expires 1y;
+        }
+
+
 }