# DO NOT EDIT - This file is being maintained by Chef
-<% [80, 443].each do |port| -%>
-<VirtualHost *:<%= port %>>
+<VirtualHost *:443>
#
# 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
#
- LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\" %Ts" combined_with_time
+ LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\" %Dus %{UNIQUE_ID}e %{SSL_PROTOCOL}x %{SSL_CIPHER}x" combined_with_time
CustomLog /var/log/apache2/access.log combined_with_time
ErrorLog /var/log/apache2/error.log
ExpiresActive On
RewriteEngine on
+ #
+ # Add the unique ID to the request headers
+ #
+ 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
#
RewriteCond %{HTTP_USER_AGENT} tilesAtHome
RewriteRule . - [F,L]
+ #
+ # Block changeset scraper
+ #
+ RewriteCond %{HTTP_USER_AGENT} "OSMApp Tuner"
+ RewriteRule . - [F,L]
+
#
# Block requests for the old 404 map tile
+ # and force cache headers on response
#
- RewriteRule ^/openlayers/img/404.png$ - [G,L]
+ <Location /openlayers/img/404.png>
+ 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]
+ </Location>
#
# Block attempts to access old API versions
#
# 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]
# Set expiry for assets
#
<Location /assets/>
- Header unset Last-Modified
Header unset ETag
FileETag None
# Set expiry for attachments
#
<Location /attachments/>
- Header unset Last-Modified
Header unset ETag
FileETag None
<Location /images/>
ExpiresDefault "access plus 10 years"
</Location>
- <Location /javascripts/>
- ExpiresDefault "access plus 10 years"
- </Location>
<Location /openlayers/>
ExpiresDefault "access plus 7 days"
</Location>
- <Location /stylesheets/>
- ExpiresDefault "access plus 10 years"
- </Location>
-
- #
- # Set expiry for Potlatch 1
- #
- <Location /potlatch/>
- ExpiresDefault "access plus 7 days"
- </Location>
-
- #
- # Set expiry for Potlatch 2
- #
- <Location /potlatch2/>
- 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"
- </Location>
#
# Configure rails
RailsEnv production
PassengerMinInstances 10
PassengerMaxRequests 5000
- PassengerPreStart http://www.openstreetmap.org/
+ 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/images/favicon.ico
+ Alias /favicon.ico <%= node[:web][:base_directory] %>/rails/app/assets/favicons/favicon.ico
Alias /openlayers <%= node[:web][:base_directory] %>/rails/vendor/assets/openlayers
Alias /stats /store/rails/stats
Alias /user/image /store/rails/user/image
# Allow all proxy requests
#
<Proxy *>
- Allow from all
+ Require all granted
</Proxy>
#
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|download))$ balancer://backend$1
+ 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
#
# 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 backends
+ # Define a load balancer for the local backends
#
<Proxy balancer://backend>
ProxySet lbmethod=bybusyness
-<% if port == 443 -%>
- BalancerMember https://rails1 disablereuse=on
- BalancerMember https://rails2 disablereuse=on
- BalancerMember https://rails3 disablereuse=on
-<% else -%>
- BalancerMember http://rails1
- BalancerMember http://rails2
- BalancerMember http://rails3
+<% node[:web][:backends].each do |backend| -%>
+ BalancerMember https://<%= backend %> disablereuse=on
<% end -%>
</Proxy>
-<% if port == 80 -%>
#
- # Redirect requests which should be secure to https
+ # Define a load balancer for the Amsterdam backends
#
- 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]
+ <Proxy balancer://amsterdam>
+ ProxySet lbmethod=bybusyness
+<% ["rails1.ams", "rails2.ams", "rails3.ams"].each do |backend| -%>
+ BalancerMember https://<%= backend %> disablereuse=on
+<% end -%>
+ </Proxy>
#
- # Redirect non-api requests made to api.osm.org to www.osm.org
+ # Define a load balancer for the Bytemark backends
#
- RewriteCond %{HTTP_HOST} =api.openstreetmap.org
- RewriteCond %{REQUEST_URI} !^/api/
- RewriteRule ^(.*)$ http://www.openstreetmap.org$1 [L,NE,R=permanent]
-<% elsif port == 443 -%>
+ <Proxy balancer://bytemark>
+ ProxySet lbmethod=bybusyness
+<% ["rails4.bm", "rails5.bm"].each do |backend| -%>
+ BalancerMember https://<%= backend %> disablereuse=on
+<% end -%>
+ </Proxy>
#
# Redirect api requests made to www.osm.org to api.osm.org
RewriteCond %{HTTP_HOST} =api.openstreetmap.org
RewriteCond %{REQUEST_URI} !^/api/
RewriteRule ^(.*)$ https://www.openstreetmap.org$1 [L,NE,R=permanent]
-<% end -%>
</VirtualHost>
-<% end -%>
<VirtualHost *:80>
- 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/
+ 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/
</VirtualHost>
-<VirtualHost *:443>
+<VirtualHost *:80>
ServerName openstreetmap.org
- ServerAlias maps.openstreetmap.org mapz.openstreetmap.org
- SSLEngine on
+ 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/
+ 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]
</VirtualHost>
<VirtualHost *:80>
- ServerName openstreetmap.org.uk
- ServerAlias www.openstreetmap.org.uk
- ServerAlias openstreetmap.co.uk
- ServerAlias www.openstreetmap.co.uk
+ ServerName www.openstreetmap.org
+ ServerAlias *
- RedirectPermanent /events.ics http://calendar.openstreetmap.org.uk/events.ics
- RedirectPermanent / http://www.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://www.openstreetmap.org$1 [L,NE,R=permanent]
+</VirtualHost>
+
+<VirtualHost *:443>
+ ServerName openstreetmap.org
+ ServerAlias *
+
+ SSLEngine on
+ 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/
</VirtualHost>
<Directory <%= node[:web][:base_directory] %>/rails/public>
projects / chef.git / blobdiff