X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/4e6e1284f19701f46df4abec8d988d6682909474..d7eb7df41c4c67b388e191a3da66714eb4bd6cd8:/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 d2e850fff..08489dc86 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]
+
+ 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]
+
#
# Block attempts to access old API versions
@@ -90,7 +95,6 @@
# Set expiry for assets
#
- Header unset Last-Modified
Header unset ETag
FileETag None
@@ -101,7 +105,6 @@
# Set expiry for attachments
#
- Header unset Last-Modified
Header unset ETag
FileETag None
@@ -154,6 +157,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
@@ -186,7 +190,7 @@
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://ic$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
@@ -218,11 +222,21 @@
#
- # Define a load balancer for the IC backends
+ # Define a load balancer for the Amsterdam backends
+ #
+
+ ProxySet lbmethod=bybusyness
+<% ["rails1.ams", "rails2.ams", "rails3.ams"].each do |backend| -%>
+ BalancerMember https://<%= backend %> disablereuse=on
+<% end -%>
+
+
+ #
+ # Define a load balancer for the Bytemark backends
#
-
+
ProxySet lbmethod=bybusyness
-<% ["rails1.ic", "rails2.ic", "rails3.ic"].each do |backend| -%>
+<% ["rails4.bm", "rails5.bm"].each do |backend| -%>
BalancerMember https://<%= backend %> disablereuse=on
<% end -%>
@@ -253,7 +267,9 @@
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
@@ -263,6 +279,21 @@
RewriteRule ^(.*)$ https://openstreetmap.org$1 [L,NE,R=permanent]
+
+ 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]
+
+
ServerName openstreetmap.org
ServerAlias *
@@ -271,6 +302,9 @@
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/