Force caching of 410 on openlayers 404 tile

[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 165b4adfc9718ad970832a44af033aecb39aee5e..6e8ab95ed132f2f53658134c55a7ee7e10e053d5 100644 (file)
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -1,14 +1,12 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 # DO NOT EDIT - This file is being maintained by Chef
 

-<% [80, 443].each do |port| -%>
-<VirtualHost *:<%= port %>>
+<VirtualHost *:443>

   #
   # Basic server configuration
   #
   ServerName <%= node[:fqdn] %>
   ServerAlias api.openstreetmap.org www.openstreetmap.org 127.0.0.1
   ServerAdmin webmaster@openstreetmap.org
   #
   # Basic server configuration
   #
   ServerName <%= node[:fqdn] %>
   ServerAlias api.openstreetmap.org www.openstreetmap.org 127.0.0.1
   ServerAdmin webmaster@openstreetmap.org

-<% if port == 443 -%>

 
   #
   # Enable SSL
 
   #
   # Enable SSL


@@ -17,7 +15,6 @@
   SSLProxyEngine on
   SSLCertificateFile /etc/ssl/certs/www.openstreetmap.org.pem
   SSLCertificateKeyFile /etc/ssl/private/www.openstreetmap.org.key
   SSLProxyEngine on
   SSLCertificateFile /etc/ssl/certs/www.openstreetmap.org.pem
   SSLCertificateKeyFile /etc/ssl/private/www.openstreetmap.org.key

-<% end -%>

 
   #
   # Setup logging
 
   #
   # Setup logging


@@ -62,8 +59,13 @@
 
   #
   # Block requests for the old 404 map tile
 
   #
   # 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 "max-age=31536000"
+    Header always set Expires "Tue, 19 Jan 2038 03:14:08 GMT"
+    RewriteRule ^ - [G,L]
+  </Location>

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


@@ -72,7 +74,7 @@
 
   #
   # Block JOSM revisions  1722-1727 as they have a serious bug that causes
 
   #
   # Block JOSM revisions  1722-1727 as they have a serious bug that causes

-  # lat/lon to be swapped (http://josm.openstreetmap.de/ticket/2804)
+  # lat/lon to be swapped (https://josm.openstreetmap.de/ticket/2804)

   #
   RewriteCond %{HTTP_USER_AGENT} "^JOSM/[0-9]+\.[0-9]+ \(172[234567]\)"
   RewriteRule . - [F,L]
   #
   RewriteCond %{HTTP_USER_AGENT} "^JOSM/[0-9]+\.[0-9]+ \(172[234567]\)"
   RewriteRule . - [F,L]


@@ -155,11 +157,8 @@
   PassengerMinInstances 10
   PassengerMaxRequests 5000
   PassengerMaxRequestQueueSize 250
   PassengerMinInstances 10
   PassengerMaxRequests 5000
   PassengerMaxRequestQueueSize 250

-<% if port == 443 -%>

   PassengerPreStart https://www.openstreetmap.org/
   PassengerPreStart https://www.openstreetmap.org/

-<% else -%>
-  PassengerPreStart http://www.openstreetmap.org/
-<% end -%>
+  PassengerAppGroupName rails

   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
   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


@@ -201,22 +200,17 @@
   ProxyPass /api/0.6/relations balancer://backend/api/0.6/relations
   ProxyPassMatch ^(/trace/[0-9]+/data(|/|.xml))$ balancer://backend$1
 
   ProxyPass /api/0.6/relations balancer://backend/api/0.6/relations
   ProxyPassMatch ^(/trace/[0-9]+/data(|/|.xml))$ balancer://backend$1
 

-  #
-  # Redirect ACME certificate challenges
-  #
-  RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
-

   #
   # Redirect trac and wiki requests to the right places
   #
   #
   # Redirect trac and wiki requests to the right places
   #

-  RedirectPermanent /trac/ http://trac.openstreetmap.org/
-  RedirectPermanent /wiki/ http://wiki.openstreetmap.org/
+  RedirectPermanent /trac/ https://trac.openstreetmap.org/
+  RedirectPermanent /wiki/ https://wiki.openstreetmap.org/

 
   #
   # Redirect requests for various images to the right place
   #
 
   #
   # Redirect requests for various images to the right place
   #

-  RedirectPermanent /images/osm_logo.png http://www.openstreetmap.org/assets/osm_logo.png
-  RedirectPermanent /images/cc_button.png http://www.openstreetmap.org/assets/cc_button.png
+  RedirectPermanent /images/osm_logo.png https://www.openstreetmap.org/assets/osm_logo.png
+  RedirectPermanent /images/cc_button.png https://www.openstreetmap.org/assets/cc_button.png

 
   #
   # Define a load balancer for the local backends
 
   #
   # Define a load balancer for the local backends


@@ -224,11 +218,17 @@
   <Proxy balancer://backend>
     ProxySet lbmethod=bybusyness
 <% node[:web][:backends].each do |backend| -%>
   <Proxy balancer://backend>
     ProxySet lbmethod=bybusyness
 <% node[:web][:backends].each do |backend| -%>

-<% if port == 443 -%>

     BalancerMember https://<%= backend %> disablereuse=on
     BalancerMember https://<%= backend %> disablereuse=on

-<% else -%>
-    BalancerMember http://<%= backend %>

 <% end -%>
 <% end -%>

+  </Proxy>
+
+  #
+  # Define a load balancer for the IC backends
+  #
+  <Proxy balancer://ams>
+    ProxySet lbmethod=bybusyness
+<% ["rails1.ams", "rails2.ams", "rails3.ams"].each do |backend| -%>
+    BalancerMember https://<%= backend %> disablereuse=on

 <% end -%>
   </Proxy>
 
 <% end -%>
   </Proxy>
 


@@ -238,39 +238,9 @@
   <Proxy balancer://bytemark>
     ProxySet lbmethod=bybusyness
 <% ["rails4.bm", "rails5.bm"].each do |backend| -%>
   <Proxy balancer://bytemark>
     ProxySet lbmethod=bybusyness
 <% ["rails4.bm", "rails5.bm"].each do |backend| -%>

-<% if port == 443 -%>

     BalancerMember https://<%= backend %> disablereuse=on
     BalancerMember https://<%= backend %> disablereuse=on

-<% else -%>
-    BalancerMember http://<%= backend %>
-<% end -%>

 <% end -%>
   </Proxy>
 <% end -%>
   </Proxy>

-<% if port == 80 -%>
-
-  #
-  # Redirect requests which should be secure to https
-  #
-  RewriteCond %{REQUEST_URI} ^/login(\.html)?$ [OR]
-  RewriteCond %{REQUEST_URI} ^/user/(new|create-account\.html)$ [OR]
-  RewriteCond %{REQUEST_URI} ^/user/terms$ [OR]
-  RewriteCond %{REQUEST_URI} ^/user/save$ [OR]
-  RewriteCond %{REQUEST_URI} ^/user/([^/]+)/account$ [OR]
-  RewriteCond %{REQUEST_URI} ^/user/reset-password$
-  RewriteRule ^(.*)$ https://www.openstreetmap.org$1 [L,NE,R=permanent]
-
-  #
-  # Redirect api requests made to www.osm.org to api.osm.org
-  #
-#  RewriteCond %{HTTP_HOST} =www.openstreetmap.org
-#  RewriteRule ^/api/(.*)$ http://api.openstreetmap.org/api/$1 [L,NE,R=permanent]
-
-  #
-  # Redirect non-api requests made to api.osm.org to www.osm.org
-  #
-  RewriteCond %{HTTP_HOST} =api.openstreetmap.org
-  RewriteCond %{REQUEST_URI} !^/api/
-  RewriteRule ^(.*)$ http://www.openstreetmap.org$1 [L,NE,R=permanent]
-<% elsif port == 443 -%>

 
   #
   # Redirect api requests made to www.osm.org to api.osm.org
 
   #
   # Redirect api requests made to www.osm.org to api.osm.org


@@ -284,10 +254,8 @@
   RewriteCond %{HTTP_HOST} =api.openstreetmap.org
   RewriteCond %{REQUEST_URI} !^/api/
   RewriteRule ^(.*)$ https://www.openstreetmap.org$1 [L,NE,R=permanent]
   RewriteCond %{HTTP_HOST} =api.openstreetmap.org
   RewriteCond %{REQUEST_URI} !^/api/
   RewriteRule ^(.*)$ https://www.openstreetmap.org$1 [L,NE,R=permanent]

-<% end -%>

 </VirtualHost>
 
 </VirtualHost>
 

-<% end -%>

 <VirtualHost *:80>
   ServerName openstreetmap.org.uk
   ServerAlias www.openstreetmap.org.uk
 <VirtualHost *:80>
   ServerName openstreetmap.org.uk
   ServerAlias www.openstreetmap.org.uk


@@ -295,14 +263,22 @@
   ServerAlias www.openstreetmap.co.uk
 
   RedirectPermanent /events.ics http://calendar.openstreetmap.org.uk/events.ics
   ServerAlias www.openstreetmap.co.uk
 
   RedirectPermanent /events.ics http://calendar.openstreetmap.org.uk/events.ics

-  RedirectPermanent / http://www.openstreetmap.org/
+  RedirectPermanent / https://www.openstreetmap.org/

 </VirtualHost>
 
 <VirtualHost *:80>
   ServerName openstreetmap.org
   ServerAlias *
 
 </VirtualHost>
 
 <VirtualHost *:80>
   ServerName openstreetmap.org
   ServerAlias *
 

-  RedirectPermanent / http://www.openstreetmap.org/
+  Header always set Cache-Control "max-age=31536000"
+  Header always set Expires "Tue, 19 Jan 2038 03:14:08 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>
 </VirtualHost>
 
 <VirtualHost *:443>


@@ -313,6 +289,9 @@
   SSLCertificateFile /etc/ssl/certs/www.openstreetmap.org.pem
   SSLCertificateKeyFile /etc/ssl/private/www.openstreetmap.org.key
 
   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:08 GMT"
+

   RedirectPermanent / https://www.openstreetmap.org/
 </VirtualHost>
 
   RedirectPermanent / https://www.openstreetmap.org/
 </VirtualHost>