X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/091ed9bfcd486fe5ae67d3e0a51bbec3dc8c1e26..412d3c00f9079b30ef1bb45955f8fac48ed1ada9:/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 fa9ab5474..b40d3774d 100644 --- a/cookbooks/web/templates/default/apache.frontend.erb +++ b/cookbooks/web/templates/default/apache.frontend.erb @@ -1,21 +1,20 @@ # DO NOT EDIT - This file is being maintained by Chef -<% [80, 443].each do |port| -%> -> + # # Basic server configuration # ServerName <%= node[:fqdn] %> - ServerAlias api.openstreetmap.org www.openstreetmap.org + ServerAlias api.openstreetmap.org www.openstreetmap.org 127.0.0.1 ServerAdmin webmaster@openstreetmap.org -<% if port == 443 -%> # # Enable SSL # SSLEngine on SSLProxyEngine on -<% end -%> + SSLCertificateFile /etc/ssl/certs/www.openstreetmap.org.pem + SSLCertificateKeyFile /etc/ssl/private/www.openstreetmap.org.key # # Setup logging @@ -56,12 +55,17 @@ # Block changeset scraper # RewriteCond %{HTTP_USER_AGENT} "OSMApp Tuner" - RewriteRule . - [F,L] + RewriteRule . - [F,L] # # 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 @@ -70,7 +74,7 @@ # # 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] @@ -153,11 +157,8 @@ PassengerMinInstances 10 PassengerMaxRequests 5000 PassengerMaxRequestQueueSize 250 -<% if port == 443 -%> 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 @@ -185,30 +186,31 @@ # # Pass some other API calls to the backends via a load balancer # - ProxyPass /api/0.6/map balancer://bytemark/api/0.6/map - ProxyPass /api/0.6/tracepoints balancer://bytemark/api/0.6/tracepoints - ProxyPass /api/0.6/amf/read balancer://bytemark/api/0.6/amf/read - ProxyPass /api/0.6/swf/trackpoints balancer://bytemark/api/0.6/swf/trackpoints - ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+/upload)$ balancer://bytemark$1 - ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+/download)$ balancer://bytemark$1 - ProxyPassMatch ^(/api/0\.6/(node|way|relation)/[0-9]+)$ balancer://bytemark$1 - ProxyPassMatch ^(/api/0\.6/(node|way|relation)/[0-9]+/(full|history|search|ways))$ balancer://bytemark$1 - ProxyPass /api/0.6/nodes balancer://bytemark/api/0.6/nodes - ProxyPass /api/0.6/ways balancer://bytemark/api/0.6/ways - ProxyPass /api/0.6/relations balancer://bytemark/api/0.6/relations - ProxyPassMatch ^(/trace/[0-9]+/data(|/|.xml))$ balancer://bytemark$1 + 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://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 + 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 ^(/trace/[0-9]+/data(|/|.xml))$ balancer://backend$1 # # 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 # - 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 @@ -216,11 +218,17 @@ ProxySet lbmethod=bybusyness <% node[:web][:backends].each do |backend| -%> -<% if port == 443 -%> BalancerMember https://<%= backend %> disablereuse=on -<% else -%> - BalancerMember http://<%= backend %> <% end -%> + + + # + # 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 -%> @@ -230,39 +238,9 @@ ProxySet lbmethod=bybusyness <% ["rails4.bm", "rails5.bm"].each do |backend| -%> -<% if port == 443 -%> BalancerMember https://<%= backend %> disablereuse=on -<% else -%> - BalancerMember http://<%= backend %> -<% end -%> <% end -%> -<% 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 @@ -276,67 +254,45 @@ RewriteCond %{HTTP_HOST} =api.openstreetmap.org RewriteCond %{REQUEST_URI} !^/api/ RewriteRule ^(.*)$ https://www.openstreetmap.org$1 [L,NE,R=permanent] -<% end -%> -<% end -%> + + ServerName openstreetmap.org.uk + ServerAlias www.openstreetmap.org.uk + ServerAlias openstreetmap.co.uk + ServerAlias www.openstreetmap.co.uk + + RedirectPermanent /events.ics http://calendar.openstreetmap.org.uk/events.ics + RedirectPermanent / https://www.openstreetmap.org/ + + ServerName openstreetmap.org - ServerAlias maps.openstreetmap.org mapz.openstreetmap.org - ServerAlias openstreetmap.com www.openstreetmap.com - ServerAlias maps.openstreetmap.com mapz.openstreetmap.com - ServerAlias openstreetmap.net www.openstreetmap.net - ServerAlias maps.openstreetmap.net mapz.openstreetmap.net - ServerAlias openstreetmap.ca www.openstreetmap.ca - ServerAlias maps.openstreetmap.ca mapz.openstreetmap.ca - ServerAlias openstreetmap.eu www.openstreetmap.eu - ServerAlias maps.openstreetmap.eu mapz.openstreetmap.eu - ServerAlias openstreetmap.pro www.openstreetmap.pro - ServerAlias maps.openstreetmap.pro mapz.openstreetmap.pro - ServerAlias openstreetmaps.org www.openstreetmaps.org - ServerAlias maps.openstreetmaps.org mapz.openstreetmaps.org - ServerAlias osm.org www.osm.org - ServerAlias maps.osm.org mapz.osm.org - ServerAlias openmaps.org www.openmaps.org - ServerAlias maps.openmaps.org mapz.openmaps.org - ServerAlias openstreetmap.io www.openstreetmap.io - ServerAlias maps.openstreetmap.io mapz.openstreetmap.io - ServerAlias osm.io www.osm.io - ServerAlias maps.osm.io mapz.osm.io - ServerAlias openworldmap.org www.openworldmap.org - ServerAlias maps.openworldmap.org mapz.openworldmap.org - ServerAlias freeosm.org www.freeosm.org - ServerAlias maps.freeosm.org mapz.freeosm.org - ServerAlias open-maps.org www.open-maps.org - ServerAlias maps.open-maps.org mapz.open-maps.org - ServerAlias open-maps.com www.open-maps.com - ServerAlias maps.open-maps.com mapz.open-maps.com - ServerAlias osmbugs.org www.osmbugs.org - ServerAlias maps.osmbugs.org mapz.osmbugs.org - - #Third Party Sites - ServerAlias openstreetmap.pm www.openstreetmap.pm - - RedirectPermanent / http://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 maps.openstreetmap.org mapz.openstreetmap.org + ServerAlias * SSLEngine on + SSLCertificateFile /etc/ssl/certs/www.openstreetmap.org.pem + SSLCertificateKeyFile /etc/ssl/private/www.openstreetmap.org.key - RedirectPermanent / https://www.openstreetmap.org/ - + Header always set Cache-Control "max-age=31536000" + Header always set Expires "Tue, 19 Jan 2038 03:14:07 GMT" - - ServerName openstreetmap.org.uk - ServerAlias www.openstreetmap.org.uk - ServerAlias openstreetmap.co.uk - 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/ /rails/public>