[GNUnet-SVN] [taler-deployment] branch master updated: fix deployment to avoid caputure of /video paths by image-resource max-cache expiration directive

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository deployment.

The following commit(s) were added to refs/heads/master by this push:
     new adc8e19  fix deployment to avoid caputure of /video paths by 
image-resource max-cache expiration directive
adc8e19 is described below

commit adc8e19c7c0057c7555d9b4549020b336292a339
Author: Christian Grothoff <address@hidden>
AuthorDate: Tue Feb 14 23:30:38 2017 +0100

    fix deployment to avoid caputure of /video paths by image-resource 
max-cache expiration directive
---
 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
index f9ef609..e43beda 100644
--- 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;
+        }
+
+
 }

-- 
To stop receiving notification emails like this one, please contact
address@hidden