X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/be74b079f8bb9c7b2b7c0279a7d2f3a5621b1cb1..b1deb24e996c8209467984a74a3b675085aed328:/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 3e7fc56c3..12beede35 100644
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -62,7 +62,7 @@
# and force cache headers on response
#
- Header always set Cache-Control "max-age=31536000"
+ 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]
@@ -96,17 +96,16 @@
#
Header unset Last-Modified
- Header unset ETag
- FileETag None
+ FileETag Size
ExpiresDefault "access plus 1 year"
+ Header set Cache-Control "immutable, max-age=31536000"
#
# Set expiry for attachments
#
- Header unset Last-Modified
Header unset ETag
FileETag None
@@ -122,32 +121,9 @@
ExpiresDefault "access plus 10 years"
-
- ExpiresDefault "access plus 10 years"
-
ExpiresDefault "access plus 7 days"
-
- ExpiresDefault "access plus 10 years"
-
-
- #
- # Set expiry for Potlatch 1
- #
-
- ExpiresDefault "access plus 7 days"
-
-
- #
- # Set expiry for Potlatch 2
- #
-
- 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"
-
#
# Configure rails
@@ -159,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
@@ -186,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
#
@@ -217,15 +194,15 @@
#
ProxySet lbmethod=bybusyness
-<% node[:web][:backends].each do |backend| -%>
+<% Array(node[:web][:backends]).each do |backend| -%>
BalancerMember https://<%= backend %> disablereuse=on
<% end -%>
#
- # 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,6 +245,20 @@
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"
@@ -297,6 +288,22 @@
/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]
+
+
+ Header append Content-Encoding gzip
+ Header append Vary Accept-Encoding
+