X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/054a87d5664b8acb33bd703f385c8b61ddcfa964..ab47927c016597f8602b81dcdc168ad5c335389d:/cookbooks/web/templates/default/apache.frontend.erb?ds=inline diff --git a/cookbooks/web/templates/default/apache.frontend.erb b/cookbooks/web/templates/default/apache.frontend.erb index 244aa0b7c..19854189b 100644 --- a/cookbooks/web/templates/default/apache.frontend.erb +++ b/cookbooks/web/templates/default/apache.frontend.erb @@ -1,25 +1,24 @@ # 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 -<% 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 @@ -29,6 +28,16 @@ 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 # @@ -42,9 +51,10 @@ RewriteRule . - [F,L] # - # Block requests for the old 404 map tile + # Block changeset scraper # - RewriteRule ^/openlayers/img/404.png$ - [G,L] + RewriteCond %{HTTP_USER_AGENT} "OSMApp Tuner" + RewriteRule . - [F,L] # # Block attempts to access old API versions @@ -53,7 +63,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] @@ -63,6 +73,13 @@ # RewriteRule ^/api/0.6/changeset/6823497/download$ - [F,L] + # + # Ignore Vicon Valerus "online" status pings + # https://gist.github.com/Firefishy/86ed5b86991b225179b54bbafbcd769e + # + RewriteCond "%{QUERY_STRING}" "^q=abcde&t=20" + RewriteRule "^/api/0\.6/notes/search$" - [R=204,L] + # # Force special MIME type for crossdomain.xml files # @@ -75,17 +92,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 @@ -101,31 +117,12 @@ 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" - + Header unset Last-Modified + FileETag Size - # - # 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" + Header always set Cache-Control "public, max-age=31536000, immutable" + Header always set Expires "Tue, 19 Jan 2038 03:14:07 GMT" # @@ -135,146 +132,184 @@ RailsEnv production PassengerMinInstances 10 PassengerMaxRequests 5000 - PassengerPreStart http://www.openstreetmap.org/ - Alias /favicon.ico <%= node[:web][:base_directory] %>/rails/app/assets/images/favicon.ico - Alias /openlayers <%= node[:web][:base_directory] %>/rails/vendor/assets/openlayers + 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] %>/static/openlayers Alias /stats /store/rails/stats Alias /user/image /store/rails/user/image Alias /attachments /store/rails/attachments # - # Preserve the host name when forwarding to the proxy - # - ProxyPreserveHost on - - # - # Set a long timeout - changeset uploads can take a long time - # - ProxyTimeout 3600 - - # - # Allow all proxy requests + # Pass authentication related headers to cgimap # - - Allow from all - + + CGIPassAuth On + # - # Pass some other API calls to the backends via a load balancer + # Pass supported calls to cgimap # - 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]+/(upload|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 + RewriteRule ^/api/0\.6/map(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P] + RewriteCond %{REQUEST_METHOD} ^(HEAD|GET)$ + RewriteRule ^/api/0\.6/(node|way|relation|changeset)/[0-9]+(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P] + RewriteRule ^/api/0\.6/(node|way|relation)/[0-9]+/history(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P] + RewriteRule ^/api/0\.6/(node|way|relation)/[0-9]+/relations(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P] + RewriteRule ^/api/0\.6/node/[0-9]+/ways(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P] + RewriteRule ^/api/0\.6/(way|relation)/[0-9]+/full(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P] + RewriteRule ^/api/0\.6/(nodes|ways|relations)(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P] + RewriteRule ^/api/0\.6/changeset/[0-9]+/(upload|download)(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P] # # 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 - # - - ProxySet lbmethod=bybusyness - BalancerMember http://rails1 - BalancerMember http://rails2 - BalancerMember http://rails3 - -<% if port == 80 -%> - - # - # Redirect requests which should be secure to the SSL site - # - 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 + # Redirect api requests made to www.openstreetmap.org to api.openstreetmap.org # # RewriteCond %{HTTP_HOST} =www.openstreetmap.org -# RewriteRule ^/api/(.*)$ http://api.openstreetmap.org/api/$1 [L,NE,R=permanent] +# RewriteRule ^/api/(.*)$ https://api.openstreetmap.org/api/$1 [L,NE,R=permanent] # - # Redirect non-api requests made to api.osm.org to www.osm.org + # Redirect non-api requests made to api.openstreetmap.org to www.openstreetmap.org # RewriteCond %{HTTP_HOST} =api.openstreetmap.org RewriteCond %{REQUEST_URI} !^/api/ - RewriteRule ^(.*)$ http://www.openstreetmap.org$1 [L,NE,R=permanent] -<% elsif port == 443 -%> + RewriteRule ^(.*)$ https://www.openstreetmap.org$1 [L,NE,R=permanent] + - # - # Redirect api requests to api.osm.org over http - # - RewriteRule ^/api/(.*)$ http://api.openstreetmap.org/api/$1 [L,NE,R=permanent] + + ServerName openstreetmap.org.uk + ServerAlias www.openstreetmap.org.uk + ServerAlias openstreetmap.co.uk + ServerAlias www.openstreetmap.co.uk - # - # Redirect requests which do not need to be secure over http - # - RewriteCond %{REQUEST_URI} !^/login(.html)?$ - RewriteCond %{REQUEST_URI} !^/user/(new|create-account.html)$ - RewriteCond %{REQUEST_URI} !^/user/terms$ - RewriteCond %{REQUEST_URI} !^/user/save$ - RewriteCond %{REQUEST_URI} !^/user/go_public$ - RewriteCond %{REQUEST_URI} !^/user/([^/]+)/account$ - RewriteCond %{REQUEST_URI} !^/user/reset-password$ - RewriteCond %{REQUEST_URI} !^/preview/ - RewriteCond %{REQUEST_URI} !^/assets/ - RewriteCond %{REQUEST_URI} !^/javascripts/ - RewriteCond %{REQUEST_URI} !^/images/ - RewriteCond %{REQUEST_URI} !^/stylesheets/ - RewriteCond %{REQUEST_URI} !^/openlayers/ - RewriteRule ^(.*)$ http://www.openstreetmap.org$1 [L,NE,R=permanent] -<% end -%> + RedirectPermanent /events.ics http://calendar.openstreetmap.org.uk/events.ics + RedirectPermanent / https://www.openstreetmap.org/ + + + + ServerName osm.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://osm.org$1 [L,NE,R=permanent] + + + + ServerName www.osm.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.osm.org$1 [L,NE,R=permanent] -<% end -%> 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 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 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 - - 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://openstreetmap.org$1 [L,NE,R=permanent] - 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] + + + 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/ + + +/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 + + + + + Require all granted + + + + Require all granted + + + + Require all granted + + + + Require all granted + + + + Require all granted + + + + Require all granted +