X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/2a64fa789a683fc98ac6a9012a9279a31ce8cbf7..0978b7eac93a4c62530bcdc1657664fcf88b74f7:/cookbooks/web/templates/default/apache.frontend.erb?ds=sidebyside
diff --git a/cookbooks/web/templates/default/apache.frontend.erb b/cookbooks/web/templates/default/apache.frontend.erb
index 6e8ab95ed..34ef0497a 100644
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -62,8 +62,8 @@
# and force cache headers on response
#
- Header always set Cache-Control "max-age=31536000"
- Header always set Expires "Tue, 19 Jan 2038 03:14:08 GMT"
+ 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]
@@ -159,6 +159,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
@@ -191,7 +192,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://bytemark$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
@@ -223,9 +224,9 @@
#
- # 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
@@ -268,10 +269,24 @@
ServerName openstreetmap.org
+
+ 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://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:08 GMT"
+ Header always set Expires "Tue, 19 Jan 2038 03:14:07 GMT"
RewriteEngine on
@@ -290,7 +305,7 @@
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"
+ Header always set Expires "Tue, 19 Jan 2038 03:14:07 GMT"
RedirectPermanent / https://www.openstreetmap.org/