X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/9ea48dbd10bd416e75abfb8fc10eb1b1c8f11842..cf1c8bfced1b1614f30ba72094759dd444e60e6b:/cookbooks/web/templates/default/apache.frontend.erb

diff --git a/cookbooks/web/templates/default/apache.frontend.erb b/cookbooks/web/templates/default/apache.frontend.erb
index 34ef0497a..45683bde2 100644
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -95,7 +95,6 @@
   # Set expiry for assets
   #
   <Location /assets/>
-    Header unset Last-Modified
     Header unset ETag
     FileETag None
 
@@ -106,7 +105,6 @@
   # Set expiry for attachments
   #
   <Location /attachments/>
-    Header unset Last-Modified
     Header unset ETag
     FileETag None
 
@@ -122,32 +120,9 @@
   <Location /images/>
     ExpiresDefault "access plus 10 years"
   </Location>
-  <Location /javascripts/>
-    ExpiresDefault "access plus 10 years"
-  </Location>
   <Location /openlayers/>
     ExpiresDefault "access plus 7 days"
   </Location>
-  <Location /stylesheets/>
-    ExpiresDefault "access plus 10 years"
-  </Location>
-
-  #
-  # Set expiry for Potlatch 1
-  #
-  <Location /potlatch/>
-    ExpiresDefault "access plus 7 days"
-  </Location>
-
-  #
-  # Set expiry for Potlatch 2
-  #
-  <Location /potlatch2/>
-    ExpiresByType application/x-shockwave-flash "access plus 1 day"
-    ExpiresByType application/xml "access plus 1 day"
-    ExpiresByType text/css "access plus 1 day"
-    ExpiresByType image/png "access plus 7 days"
-  </Location>
 
   #
   # Configure rails