X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/eefd3a59342ff88ce37cbf4c82a0ea1d3318bebd..58513ca6865fbbd1849fb128f4b153a59b6f93ea:/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 4030eda4f..6690a255e 100644
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -57,16 +57,6 @@
   RewriteCond %{HTTP_USER_AGENT} "OSMApp Tuner"
   RewriteRule . - [F,L]
 
-  #
-  # Block requests for the old 404 map tile
-  # and force cache headers on response
-  #
-  <Location /openlayers/img/404.png>
-    Header always set Cache-Control "public, max-age=31536000, immutable"
-    Header always set Expires "Tue, 19 Jan 2038 03:14:07 GMT"
-    RewriteRule ^ - [G,L]
-  </Location>
-
   #
   # Block attempts to access old API versions
   #
@@ -122,7 +112,11 @@
     ExpiresDefault "access plus 10 years"
   </Location>
   <Location /openlayers/>
-    ExpiresDefault "access plus 7 days"
+    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>
 
   #
@@ -138,7 +132,7 @@
   SetEnv OPENSTREETMAP_STATUS <%= @status %>
   SetEnv SECRET_KEY_BASE <%= @secret_key_base %>
   Alias /favicon.ico <%= node[:web][:base_directory] %>/rails/app/assets/favicons/favicon.ico
-  Alias /openlayers <%= node[:web][:base_directory] %>/rails/vendor/assets/openlayers
+  Alias /openlayers <%= node[:web][:base_directory] %>/static/openlayers
   Alias /stats /store/rails/stats
   Alias /user/image /store/rails/user/image
   Alias /attachments /store/rails/attachments
@@ -163,18 +157,18 @@
   #
   # Pass some other API calls to the backends via a load balancer
   #
-  ProxyPass /api/0.6/map balancer://backend/api/0.6/map
-  ProxyPass /api/0.6/tracepoints balancer://backend/api/0.6/tracepoints
-  ProxyPass /api/0.6/amf/read balancer://backend/api/0.6/amf/read
-  ProxyPass /api/0.6/swf/trackpoints balancer://backend/api/0.6/swf/trackpoints
-  ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+)$ balancer://backend$1
-  ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+/upload)$ balancer://amsterdam$1
-  ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+/download)$ balancer://backend$1
-  ProxyPassMatch ^(/api/0\.6/(node|way|relation)/[0-9]+)$ balancer://backend$1
-  ProxyPassMatch ^(/api/0\.6/(node|way|relation)/[0-9]+/(full|history|search|ways))$ balancer://backend$1
-  ProxyPass /api/0.6/nodes balancer://backend/api/0.6/nodes
-  ProxyPass /api/0.6/ways balancer://backend/api/0.6/ways
-  ProxyPass /api/0.6/relations balancer://backend/api/0.6/relations
+  ProxyPassMatch ^(/api/0\.6/map(\.json|\.xml)?)$ balancer://backend$1
+  ProxyPassMatch ^(/api/0\.6/tracepoints)$ balancer://backend$1
+  ProxyPassMatch ^(/api/0\.6/amf/read)$ balancer://backend$1
+  ProxyPassMatch ^(/api/0\.6/swf/trackpoints)$ balancer://backend$1
+  ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+(\.json|\.xml)?)$ balancer://backend$1
+  ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+/upload(\.json|\.xml)?)$ balancer://amsterdam$1
+  ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+/download(\.json|\.xml)?)$ balancer://backend$1
+  ProxyPassMatch ^(/api/0\.6/(node|way|relation)/[0-9]+(\.json|\.xml)?)$ balancer://backend$1
+  ProxyPassMatch ^(/api/0\.6/(node|way|relation)/[0-9]+/(full|history|search|ways|relations)(\.json|\.xml)?)$ balancer://backend$1
+  ProxyPassMatch ^(/api/0\.6/nodes(\.json|\.xml)?)$ balancer://backend$1
+  ProxyPassMatch ^(/api/0\.6/ways(\.json|\.xml)?)$ balancer://backend$1
+  ProxyPassMatch ^(/api/0\.6/relations(\.json|\.xml)?)$ balancer://backend$1
   ProxyPassMatch ^(/trace/[0-9]+/data(|/|.xml))$ balancer://backend$1
 
   #
@@ -194,7 +188,7 @@
   #
   <Proxy balancer://backend>
     ProxySet lbmethod=bybusyness
-<% node[:web][:backends].each do |backend| -%>
+<% Array(node[:web][:backends]).each do |backend| -%>
     BalancerMember https://<%= backend %> disablereuse=on
 <% end -%>
   </Proxy>
@@ -291,14 +285,16 @@
 
   RewriteCond "%{HTTP:Accept-encoding}" "gzip"
   RewriteCond "%{REQUEST_FILENAME}\.gz" -s
-  RewriteRule "^(.*)\.(css|js|json|svg)$" "$1\.$2\.gz" [QSA]
+  RewriteRule "^(.*)\.(css|ico|js|json|svg|xml)$" "$1\.$2\.gz" [QSA]
 
   RewriteRule "\.css\.gz$" "-" [T=text/css,E=no-gzip:1]
+  RewriteRule "\.ico\.gz$"  "-" [T=image/vnd.microsoft.icon,E=no-gzip:1]
   RewriteRule "\.js\.gz$"  "-" [T=text/javascript,E=no-gzip:1]
   RewriteRule "\.json\.gz$"  "-" [T=application/json,E=no-gzip:1]
   RewriteRule "\.svg\.gz$"  "-" [T=image/svg+xml,E=no-gzip:1]
+  RewriteRule "\.xml\.gz$"  "-" [T=application/xml,E=no-gzip:1]
 
-  <FilesMatch "(\.js\.gz|\.json\.gz|\.css\.gz|\.svg\.gz)$">
+  <FilesMatch "\.(css|ico|js|json|svg|xml)\.gz$">
     Header append Content-Encoding gzip
     Header append Vary Accept-Encoding
   </FilesMatch>