X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/e0388a93febd26e9c2214d264011f7af77c76ea3..06e08972b38a6b670309a044abe90cf09fac55b1:/cookbooks/tilecache/templates/default/nginx_tile.conf.erb diff --git a/cookbooks/tilecache/templates/default/nginx_tile.conf.erb b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb index eeb429401..7c70e52ee 100644 --- a/cookbooks/tilecache/templates/default/nginx_tile.conf.erb +++ b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb @@ -1,29 +1,34 @@ # DO NOT EDIT - This file is being maintained by Chef upstream tile_cache_backend { - server 127.0.0.1:8080; - server 127.0.0.2:8080; + server 127.0.0.1:8080 weight=1000 max_fails=32; + server 127.0.0.2:8080 weight=1000 max_fails=32; - # Add the other caches to relieve pressure if local squid failing + # Add the tile_siblings caches to relieve pressure if local squid failing # Balancer: round-robin +<% server_weight = 1000 -%> +<% Array(@node[:tilecache][:tile_siblings]).each do |cache_peer| -%> <% @caches.each do |cache| -%> +<% if cache_peer == cache[:fqdn] -%> <% if cache[:hostname] != node[:hostname] -%> <% cache.ipaddresses(:family => :inet, :role => :external).sort.each do |address| -%> - server <%= address %>:80 backup; # Server <%= cache[:hostname] %> + server <%= address %>:80 weight=<%= server_weight %> max_fails=32 backup; # Server <%= cache[:hostname] %> +<% server_weight -= server_weight.div(2) -%> +<% end -%> +<% end -%> <% end -%> <% end -%> <% end -%> - keepalive 512; - keepalive_requests 1024; + keepalive 128; } # Geo Map of tile caches geo $tile_cache { - default 0; + default "client"; <% @caches.each do |cache| -%> <% cache.ipaddresses(:family => :inet, :role => :external).sort.each do |address| -%> - <%= address %> 1; # <%= cache[:hostname] %> + <%= address %> "cache"; # <%= cache[:hostname] %> <% end -%> <% end -%> } @@ -54,10 +59,12 @@ map $http_user_agent $denied_scraper { '~^Java\/' 1; # Library Default '~^tiles$' 1; # Library Default '~^okhttp\/' 1; # Library Default - '~^Microsoft-ATL-Native\/' 1; #Library Default + '~^Microsoft-ATL-Native\/' 1; # Library Default '/n software IPWorks HTTP/S Component - www.nsoftware.com' 1; #Library default + '~^Wget\/' 1; # Library Default 'C# TilesDownloader' 1; # Downloader 'MapDownloader' 1; # Downloader + '~^staticmaps' 1; # Downloader 'Android' 1; # Default or fake 'kc_android' 1; # Default or fake 'Mozilla/4.0' 1; # Fake @@ -69,20 +76,37 @@ map $http_user_agent $denied_scraper { 'com.soft373.taptaxi' 1; 'com.kradac.ktxcore' 1; 'ru.crowdsystems.topcontrol.knd' 1; + 'pl.itaxi.driver' 1; + 'net.uztaxi.driver' 1; + 'OSMDroid/2.1 (its; rutaxi 3.28.0)' 1; + 'com.helleniccomms.mercedes.driver' 1; + 'ru.taximaster.www' 1; + 'com.arobs.trackgps' 1; + 'com.helleniccomms.asteras.driver' 1; + # '~[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}' 1; # Fake UA } map $http_referer $denied_referer { default 0; # Not denied 'http://www.openstreetmap.org/' 1; # Faked 'http://www.openstreetmap.org' 1; # Faked + 'https://www.openstreetmap.org' 1; # Faked 'http://openstreetmap.org/' 1; # Faked 'http://openstreetmap.org' 1; # Faked + 'https://openstreetmap.org' 1; # Faked 'http://www.osm.org/' 1; # Faked 'http://www.osm.org' 1; # Faked 'http://osm.org/' 1; # Faked 'http://osm.org' 1; # Faked - '~^http://google\.com' 1; # Faked - '~^http://www\.google\.com' 1; # Faked + 'http://google.com' 1; # Faked + 'http://www.google.com' 1; # Faked + 'http://google.com/' 1; # Faked + 'http://www.google.com/' 1; # Faked + 'https://google.com' 1; # Faked + 'https://www.google.com' 1; # Faked + 'https://google.com/' 1; # Faked + 'https://www.google.com/' 1; # Faked + 'http://www.microsoft.com/' 1; # Faked '~^https?://pmap\.kuku\.lu/' 1; # Too much traffic '~^https?://[^.]*\.pmap\.kuku\.lu/' 1; # Too much traffic '~^https?://fastpokemap\.com/' 1; # Too much traffic @@ -91,6 +115,10 @@ map $http_referer $denied_referer { '~^https?://[^.]*\.pkget\.com/' 1; # Too much traffic '~^https?://twpkinfo\.com/' 1; # Too much traffic '~^https?://[^.]*\.twpkinfo\.com/' 1; # Too much traffic + '~^https?://9db\.jp/' 1; # Too much traffic + '~^https?://[^.]*\.9db\.jp/' 1; # Too much traffic + '~^https?://clustrmaps\.com/' 1; # Too much traffic + '~^https?://[^.]*\.clustrmaps\.com/' 1; # Too much traffic } map $http_referer $osm_referer { @@ -99,17 +127,34 @@ map $http_referer $osm_referer { } # Limit Cache-Control header to only approved User-Agents -map $osm_referer$http_user_agent $limit_http_cache_control { - default ''; # Unset Header - '~^osmMozilla\/5\.0\ QGIS\/' ''; # Unset Header - '~^osmMozilla\/5\.0\ ' $http_cache_control; # Pass Header +map $tile_cache$osm_referer$http_user_agent $limit_http_cache_control { + default ''; # Unset Header + '~^clientosmMozilla\/5\.0\ \(X11' $http_cache_control; # Pass Header + '~^clientosmMozilla\/5\.0\ \(Windows' $http_cache_control; # Pass Header + '~^clientosmMozilla\/5\.0\ \(iPhone' $http_cache_control; # Pass Header + '~^clientosmMozilla\/5\.0\ \(Macintosh' $http_cache_control; # Pass Header + '~^clientosmMozilla\/5\.0\ \(Linux' $http_cache_control; # Pass Header } # Limit Pragma header to only approved User-Agents -map $osm_referer$http_user_agent $limit_http_pragma { - default ''; # Unset Header - '~^osmMozilla\/5\.0\ QGIS\/' ''; # Unset Header - '~^osmMozilla\/5\.0\ ' $http_pragma; # Pass Header +map $tile_cache$osm_referer$http_user_agent $limit_http_pragma { + default ''; # Unset Header + '~^clientosmMozilla\/5\.0\ \(X11' $http_pragma; # Pass Header + '~^clientosmMozilla\/5\.0\ \(Windows' $http_pragma; # Pass Header + '~^clientosmMozilla\/5\.0\ \(iPhone' $http_pragma; # Pass Header + '~^clientosmMozilla\/5\.0\ \(Macintosh' $http_pragma; # Pass Header + '~^clientosmMozilla\/5\.0\ \(Linux' $http_pragma; # Pass Header +} + +# Find Browser User-Agents which are not sending a referer. +# Browsers with no referer could be due to Browser extension or website Referrer-Policy +map $tile_cache$http_referer$scheme$http_user_agent $deny_missing_referer { + default 0; # Not denied + '~^clienthttpsMozilla\/5\.0\ \(X11' 1; + '~^clienthttpsMozilla\/5\.0\ \(Windows' 1; + '~^clienthttpsMozilla\/5\.0\ \(iPhone' 1; + '~^clienthttpsMozilla\/5\.0\ \(Macintosh' 1; + '~^clienthttpsMozilla\/5\.0\ \(Linux' 1; } server { @@ -134,66 +179,51 @@ server { # Immediately 404 layers we do not support <% for i in 20..99 do %> location /<%= i %>/ { - set $limit_rate 512; return 404; } <% end %> # Immediately 404 silly tile requests location = /0/0/-1.png { - set $limit_rate 512; return 404; } location = /1/0/-1.png { - set $limit_rate 512; return 404; } location = /1/-1/0.png { - set $limit_rate 512; return 404; } location = /1/-1/1.png { - set $limit_rate 512; return 404; } location = /1/-1/-1.png { - set $limit_rate 512; return 404; } location = /1/-1/2.png { - set $limit_rate 512; return 404; } location = /1/1/-1.png { - set $limit_rate 512; return 404; } location = /1/2/-1.png { - set $limit_rate 512; return 404; } location = /2/0/-1.png { - set $limit_rate 512; return 404; } location = /2/-1/0.png { - set $limit_rate 512; return 404; } location = /2/-1/1.png { - set $limit_rate 512; return 404; } location = /2/1/-1.png { - set $limit_rate 512; return 404; } location = /2/-1/2.png { - set $limit_rate 512; return 404; } location = /2/-1/3.png { - set $limit_rate 512; return 404; } @@ -217,6 +247,8 @@ server { proxy_connect_timeout 20s; + proxy_next_upstream_tries 2; + # Replace host header. proxy_set_header Host 'tile.openstreetmap.org'; # Do not pass cookies to backends. @@ -259,7 +291,14 @@ server { proxy_cache_revalidate on; proxy_cache_min_uses 4; - add_header x-cache-status $upstream_cache_status; + add_header x-cache-status "$upstream_cache_status - <%= node[:hostname] %>"; +<% else %> + # Severely rate limit Browser UAs which are not sending a referer. + # With no referer we do not know who is using tiles + if ($deny_missing_referer) { + set $limit_rate 1024; + add_header x-cache-ratelimit "missing-referer"; + } <% end -%> # Set a QoS cookie if none presented (uses nginx Map)