X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/eefd3a59342ff88ce37cbf4c82a0ea1d3318bebd..699e157e3d708f38064eea9072aa210fe5ccac30:/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 4030eda4f..e67961232 100644 --- a/cookbooks/web/templates/default/apache.frontend.erb +++ b/cookbooks/web/templates/default/apache.frontend.erb @@ -12,7 +12,6 @@ # Enable SSL # SSLEngine on - SSLProxyEngine on SSLCertificateFile /etc/ssl/certs/www.openstreetmap.org.pem SSLCertificateKeyFile /etc/ssl/private/www.openstreetmap.org.key @@ -57,16 +56,6 @@ RewriteCond %{HTTP_USER_AGENT} "OSMApp Tuner" RewriteRule . - [F,L] - # - # Block requests for the old 404 map tile - # and force cache headers on response - # - - 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 # @@ -84,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=429,L] + # # Force special MIME type for crossdomain.xml files # @@ -122,7 +118,11 @@ ExpiresDefault "access plus 10 years" - ExpiresDefault "access plus 7 days" + Header unset Last-Modified + FileETag Size + + Header always set Cache-Control "public, max-age=31536000, immutable" + Header always set Expires "Tue, 19 Jan 2038 03:14:07 GMT" # @@ -138,44 +138,30 @@ 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 + 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 + # Pass authentication related headers to cgimap # - ProxyPreserveHost on - - # - # Set a long timeout - changeset uploads can take a long time - # - ProxyTimeout 3600 - - # - # Allow all proxy requests - # - - Require all granted - + + 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]+)$ 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 + 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 @@ -190,43 +176,13 @@ RedirectPermanent /images/cc_button.png https://www.openstreetmap.org/assets/cc_button.png # - # Define a load balancer for the local backends - # - - ProxySet lbmethod=bybusyness -<% node[:web][:backends].each do |backend| -%> - BalancerMember https://<%= backend %> disablereuse=on -<% 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 -%> - - - # - # Define a load balancer for the Bytemark backends - # - - ProxySet lbmethod=bybusyness -<% ["rails4.bm", "rails5.bm"].each do |backend| -%> - BalancerMember https://<%= backend %> disablereuse=on -<% end -%> - - - # - # 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/(.*)$ 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/ @@ -243,6 +199,34 @@ 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] + + ServerName openstreetmap.org @@ -291,19 +275,25 @@ RewriteCond "%{HTTP:Accept-encoding}" "gzip" RewriteCond "%{REQUEST_FILENAME}\.gz" -s - RewriteRule "^(.*)\.(css|js|json|svg)$" "$1\.$2\.gz" [QSA] + 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