X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/45b7810de02974d8e5c7c51874238c4f76f42e94..0c82d0842e77184f2080f0d2bae5ab343c55ca54:/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 4f6680233..4495f568a 100644
--- a/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
+++ b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
@@ -4,18 +4,23 @@ upstream tile_cache_backend {
   server 127.0.0.1:8080;
   server 127.0.0.2:8080;
 
-  # 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 = 20 -%>
+<% @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.div(10) %>; # Server <%= cache[:hostname] %>
+<% server_weight += 5 -%>
+<% end -%>
+<% end -%>
 <% end -%>
 <% end -%>
 <% end -%>
 
-  keepalive 512;
-  keepalive_requests 1024;
+  keepalive 128;
 }
 
 # Geo Map of tile caches
@@ -54,11 +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
+  '~^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
@@ -70,6 +76,14 @@ 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 {
@@ -92,6 +106,7 @@ map $http_referer $denied_referer {
   '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
@@ -100,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 {
@@ -121,6 +140,17 @@ map $osm_referer$http_user_agent $limit_http_pragma {
   '~^osmMozilla\/5\.0\ ' $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 $http_referer$scheme$http_user_agent $deny_missing_referer {
+  default                             0; # Not denied
+  '~^httpsMozilla\/5\.0\ \(X11'       1;
+  '~^httpsMozilla\/5\.0\ \(Windows'   1;
+  '~^httpsMozilla\/5\.0\ \(iPhone'    1;
+  '~^httpsMozilla\/5\.0\ \(Macintosh' 1;
+  '~^httpsMozilla\/5\.0\ \(Linux'     1;
+}
+
 server {
     # IPv4
     listen       80 deferred backlog=16384 reuseport fastopen=2048 default_server;
@@ -269,6 +299,13 @@ server {
       proxy_cache_min_uses 4;
 
       add_header x-cache-status $upstream_cache_status;
+<% 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)