X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/4d63db9cd58ab8b688309f83cda1abaf5eb7502b..ae4d13c8ba1b86d2f94bcdec799d0db052425333:/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 1a3f9cfa3..a950d7746 100644 --- a/cookbooks/web/templates/default/apache.frontend.erb +++ b/cookbooks/web/templates/default/apache.frontend.erb @@ -6,7 +6,7 @@ # 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 -%> @@ -15,6 +15,8 @@ # SSLEngine on SSLProxyEngine on + SSLCertificateFile /etc/ssl/certs/www.openstreetmap.org.pem + SSLCertificateKeyFile /etc/ssl/private/www.openstreetmap.org.key <% end -%> # @@ -35,6 +37,11 @@ # RequestHeader set X-Request-Id %{UNIQUE_ID}e + # + # Remove Proxy request header to mitigate https://httpoxy.org/ + # + RequestHeader unset Proxy early + # # Block troublesome GPX data scrapping # @@ -51,7 +58,7 @@ # Block changeset scraper # RewriteCond %{HTTP_USER_AGENT} "OSMApp Tuner" - RewriteRule . - [F,L] + RewriteRule . - [F,L] # # Block requests for the old 404 map tile @@ -65,7 +72,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] @@ -184,7 +191,8 @@ 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]+/upload)$ balancer://bytemark$1 + 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]+/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 @@ -193,17 +201,22 @@ 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 # - 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 @@ -220,11 +233,11 @@ # - # Define a load balancer for the Bytemark backends + # Define a load balancer for the IC backends # - + ProxySet lbmethod=bybusyness -<% ["rails4.bm", "rails5.bm"].each do |backend| -%> +<% ["rails1.ic", "rails2.ic", "rails3.ic"].each do |backend| -%> <% if port == 443 -%> BalancerMember https://<%= backend %> disablereuse=on <% else -%> @@ -275,65 +288,37 @@ <% 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 * + + RewriteEngine on + + 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/ - - 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/ - - /rails/public> Require all granted