X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/fba89b0d71a9dd87d0c3c57fb2f84263c3b36a14..002e934c3f9d818e59b74fdb021f93766799ea9c:/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 6cbf86418..12beede35 100644
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -59,8 +59,13 @@
 
   #
   # Block requests for the old 404 map tile
+  # and force cache headers on response
   #
-  RewriteRule ^/openlayers/img/404.png$ - [G,L]
+  <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
@@ -91,17 +96,16 @@
   #
   <Location /assets/>
     Header unset Last-Modified
-    Header unset ETag
-    FileETag None
+    FileETag Size
 
     ExpiresDefault "access plus 1 year"
+    Header set Cache-Control "immutable, max-age=31536000"
   </Location>
 
   #
   # Set expiry for attachments
   #
   <Location /attachments/>
-    Header unset Last-Modified
     Header unset ETag
     FileETag None
 
@@ -117,32 +121,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
@@ -154,6 +135,7 @@
   PassengerMaxRequestQueueSize 250
   PassengerPreStart https://www.openstreetmap.org/
   PassengerAppGroupName rails
+  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
@@ -181,18 +163,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://bytemark$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
 
   #
@@ -212,15 +194,15 @@
   #
   <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>
 
   #
-  # Define a load balancer for the IC backends
+  # Define a load balancer for the Amsterdam backends
   #
-  <Proxy balancer://ams>
+  <Proxy balancer://amsterdam>
     ProxySet lbmethod=bybusyness
 <% ["rails1.ams", "rails2.ams", "rails3.ams"].each do |backend| -%>
     BalancerMember https://<%= backend %> disablereuse=on
@@ -263,7 +245,9 @@
 
 <VirtualHost *:80>
   ServerName openstreetmap.org
-  ServerAlias *
+
+  Header always set Cache-Control "max-age=31536000"
+  Header always set Expires "Tue, 19 Jan 2038 03:14:07 GMT"
 
   RewriteEngine on
 
@@ -273,6 +257,21 @@
   RewriteRule ^(.*)$ https://openstreetmap.org$1 [L,NE,R=permanent]
 </VirtualHost>
 
+<VirtualHost *:80>
+  ServerName www.openstreetmap.org
+  ServerAlias *
+
+  Header always set Cache-Control "max-age=31536000"
+  Header always set Expires "Tue, 19 Jan 2038 03:14:07 GMT"
+
+  RewriteEngine on
+
+  RewriteRule ^/\.well-known/acme-challenge/(.*)$ http://acme.openstreetmap.org/.well-known/acme-challenge/$1 [R=permanent,L]
+
+  RewriteCond %{REQUEST_URI} !^/server-status$
+  RewriteRule ^(.*)$ https://www.openstreetmap.org$1 [L,NE,R=permanent]
+</VirtualHost>
+
 <VirtualHost *:443>
   ServerName openstreetmap.org
   ServerAlias *
@@ -281,11 +280,30 @@
   SSLCertificateFile /etc/ssl/certs/www.openstreetmap.org.pem
   SSLCertificateKeyFile /etc/ssl/private/www.openstreetmap.org.key
 
+  Header always set Cache-Control "max-age=31536000"
+  Header always set Expires "Tue, 19 Jan 2038 03:14:07 GMT"
+
   RedirectPermanent / https://www.openstreetmap.org/
 </VirtualHost>
 
 <Directory <%= node[:web][:base_directory] %>/rails/public>
   Require all granted
+
+  RewriteCond "%{HTTP:Accept-encoding}" "gzip"
+  RewriteCond "%{REQUEST_FILENAME}\.gz" -s
+  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 "\.(css|ico|js|json|svg|xml)\.gz$">
+    Header append Content-Encoding gzip
+    Header append Vary Accept-Encoding
+  </FilesMatch>
 </Directory>
 
 <Directory /srv/www.openstreetmap.org/rails/app/assets>