forum: switch to apache mpm event

[chef.git] / 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 685912862ad913327a2ec09c855df21604cf7eb3..d99dd532fa34152957c930a22d6be2f89921c516 100644 (file)
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -57,17 +57,6 @@
   RewriteCond %{HTTP_USER_AGENT} "OSMApp Tuner"
   RewriteRule . - [F,L]
 
   RewriteCond %{HTTP_USER_AGENT} "OSMApp Tuner"
   RewriteRule . - [F,L]
 

-  #
-  # Force extended cache headers on the old 404 map tile
-  #
-  <Location /openlayers/img/404.png>
-    Header unset Last-Modified
-    FileETag Size
-
-    Header always set Cache-Control "public, max-age=31536000, immutable"
-    Header always set Expires "Tue, 19 Jan 2038 03:14:07 GMT"
-  </Location>
-

   #
   # Block attempts to access old API versions
   #
   #
   # Block attempts to access old API versions
   #


@@ -126,7 +115,8 @@
     Header unset Last-Modified
     FileETag Size
 
     Header unset Last-Modified
     FileETag Size
 

-    ExpiresDefault "access plus 7 days"
+    Header always set Cache-Control "public, max-age=31536000, immutable"
+    Header always set Expires "Tue, 19 Jan 2038 03:14:07 GMT"

   </Location>
 
   #
   </Location>
 
   #


@@ -310,6 +300,10 @@
   </FilesMatch>
 </Directory>
 
   </FilesMatch>
 </Directory>
 

+<Directory /srv/www.openstreetmap.org/static>
+  Require all granted
+</Directory>
+

 <Directory /srv/www.openstreetmap.org/rails/app/assets>
   Require all granted
 </Directory>
 <Directory /srv/www.openstreetmap.org/rails/app/assets>
   Require all granted
 </Directory>