X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d2c83d07d878fbe74e30c0f964933868046e86db..832e7a6729ac5028eda43fe93c9dfe4409f60426:/config/nginx.conf

diff --git a/config/nginx.conf b/config/nginx.conf
index 1108be5dc..5071a260b 100644
--- a/config/nginx.conf
+++ b/config/nginx.conf
@@ -157,7 +157,22 @@ http {
  
         # Strip asset tags
         location ~ ^/(images|javascripts|openlayers|stylesheets|user/image)/ {
+            # Strip asset tags
             rewrite ^/(.*)/[0-9]+$ /$1;
+
+            # Set expiry to the maximum - the asset tag will change
+            # when there is a new version
+            expires max;
+
+            # Only cache OpenLayers for seven days though
+            if ($uri ~ ^/openlayers/) {
+                expires 7d;
+            }
+        }
+
+        # Cache the embedded map page for seven days
+        location ~ ^/export/embed.html$ {
+            expires 7d;
         }
 
         # Include fastcgi configuration
@@ -205,17 +220,6 @@ http {
             return 404;
         }
             
-        # Handle Special Case Expiry
-        location ~ ^/openlayers/ {
-            expires 7d;
-        }
-        location ~ ^/export/embed.html$ {
-            expires 7d;
-        }
-        location ~ ^/(images|javascripts|stylesheets)/ {
-            expires max;
-        }
-
         # Send everything else to the web backend unless it exists
         # in the rails public tree    
         location / {