X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/31a516770ed279c68a6fb17ec9a498824becdcf3..c9bac0802fe6ca5a21d8038a71973f1992610a79:/cookbooks/planet/templates/default/apache.erb diff --git a/cookbooks/planet/templates/default/apache.erb b/cookbooks/planet/templates/default/apache.erb index dd2c824e1..6ad68703a 100644 --- a/cookbooks/planet/templates/default/apache.erb +++ b/cookbooks/planet/templates/default/apache.erb @@ -1,17 +1,17 @@ # DO NOT EDIT - This file is being maintained by Chef - + ServerName planet.openstreetmap.org ServerAlias planet.osm.org ServerAdmin webmaster@openstreetmap.org + CustomLog /var/log/apache2/planet.openstreetmap.org-access.log combined + ErrorLog /var/log/apache2/planet.openstreetmap.org-error.log + SSLEngine on SSLCertificateFile /etc/ssl/certs/planet.openstreetmap.org.pem SSLCertificateKeyFile /etc/ssl/private/planet.openstreetmap.org.key - CustomLog /var/log/apache2/planet.openstreetmap.org-access.log combined - ErrorLog /var/log/apache2/planet.openstreetmap.org-error.log - DocumentRoot /store/planet @@ -34,39 +34,52 @@ Redirect /pbf-experimental/ /pbf/ - - Header set Access-Control-Allow-Origin "*" - + + Header set Access-Control-Allow-Origin "*" + RewriteEngine on RewriteMap latestplanet prg:/usr/local/bin/apache-latest-planet-filename #Direct, no redirect for the following - RewriteCond %{REMOTE_ADDR} ^193\.63\. [OR] - RewriteCond %{REMOTE_ADDR} ^127\. [OR] - RewriteCond %{REMOTE_ADDR} ^10\. [OR] - RewriteCond %{REMOTE_ADDR} ^193\.1\.219\.88 [OR] - RewriteCond %{REMOTE_ADDR} ^193\.1\.193\.64 [OR] - RewriteCond %{REMOTE_ADDR} ^146\.169\. [OR] - RewriteCond %{REMOTE_ADDR} ^129\.31\. [OR] - RewriteCond %{REMOTE_ADDR} ^193\.60\. [OR] - RewriteCond %{REMOTE_ADDR} ^193\.61\. [OR] - RewriteCond %{REMOTE_ADDR} ^193\.62\. [OR] - RewriteCond %{REMOTE_ADDR} ^193\.63\. [OR] - RewriteCond %{QUERY_STRING} nomirror + RewriteCond %{REMOTE_ADDR} ^127\. [OR] + RewriteCond %{REMOTE_ADDR} ^10\. [OR] + RewriteCond %{REMOTE_ADDR} ^193\.60\. [OR] + RewriteCond %{REMOTE_ADDR} ^193\.61\. [OR] + RewriteCond %{REMOTE_ADDR} ^193\.62\. [OR] + RewriteCond %{REMOTE_ADDR} ^193\.63\. [OR] + RewriteCond %{QUERY_STRING} nomirror RewriteRule .* - [L] - RewriteRule ^(/planet/planet\-latest\.osm\.bz2)$ ${latestplanet:$1} [R,L] + RewriteRule ^(/planet/planet\-latest\.osm\.bz2)$ ${latestplanet:$1} [R,L] + RewriteRule ^(/planet/full\-history/history\-latest\.osm\.bz2)$ ${latestplanet:$1} [R,L] + RewriteRule ^(/planet/changesets\-latest\.osm\.bz2)$ ${latestplanet:$1} [R,L] + RewriteRule ^(/planet/discussions\-latest\.osm\.bz2)$ ${latestplanet:$1} [R,L] + + RewriteRule ^(/pbf/planet\-latest\.osm\.pbf)$ ${latestplanet:$1} [R,L] + RewriteRule ^(/pbf/full\-history/history\-latest\.osm\.pbf)$ ${latestplanet:$1} [R,L] + + RewriteRule ^(/cc\-by\-sa/pbf/planet\-latest\.osm\.pbf)$ ${latestplanet:$1} [R,L] + RewriteRule ^(/cc\-by\-sa/planet\-latest\.osm\.bz2)$ ${latestplanet:$1} [R,L] + RewriteRule ^(/cc\-by\-sa/changesets\-latest\.osm\.bz2)$ ${latestplanet:$1} [R,L] + RewriteRule ^(/cc\-by\-sa/relations\-latest\.osm\.bz2)$ ${latestplanet:$1} [R,L] + + # Temporary download rate limit due to upstream fibre connection issues. - 13 Jan 2020 + + SetOutputFilter RATE_LIMIT + SetEnv rate-limit 2048 + SetEnv rate-initial-burst 4096 + - ServerName planet.openstreetmap.org - ServerAlias planet.osm.org - ServerAdmin webmaster@openstreetmap.org + ServerName planet.openstreetmap.org + ServerAlias planet.osm.org + ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/planet.openstreetmap.org-access.log combined - ErrorLog /var/log/apache2/planet.openstreetmap.org-error.log + CustomLog /var/log/apache2/planet.openstreetmap.org-access.log combined + ErrorLog /var/log/apache2/planet.openstreetmap.org-error.log - RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/ - RedirectPermanent / https://planet.openstreetmap.org/ + RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/ + RedirectPermanent / https://planet.openstreetmap.org/