Merge remote-tracking branch 'github/pull/396'

[chef.git] / 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 5c4183820526a4e16709e559779386641e21b24f..338e0d51d01889acfaf2f9877e9772c53a359de5 100644 (file)
--- a/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
+++ b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
@@ -1,8 +1,8 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 upstream tile_cache_backend {
 # DO NOT EDIT - This file is being maintained by Chef
 
 upstream tile_cache_backend {

-  server 127.0.0.1:8080 weight=1000;
-  server 127.0.0.2:8080 weight=1000;
+  server 127.0.0.1:8080 weight=1000 max_fails=32;
+  server 127.0.0.2:8080 weight=1000 max_fails=32;

 
   # Add the tile_siblings caches to relieve pressure if local squid failing
   # Balancer: round-robin
 
   # Add the tile_siblings caches to relieve pressure if local squid failing
   # Balancer: round-robin


@@ -12,7 +12,7 @@ upstream tile_cache_backend {
 <% if cache_peer == cache[:fqdn] -%>
 <% if cache[:hostname] != node[:hostname] -%>
 <% cache.ipaddresses(:family => :inet, :role => :external).sort.each do |address| -%>
 <% if cache_peer == cache[:fqdn] -%>
 <% if cache[:hostname] != node[:hostname] -%>
 <% cache.ipaddresses(:family => :inet, :role => :external).sort.each do |address| -%>

-  server <%= address %>:80 weight=<%= server_weight %> 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 -%>
 <% server_weight -= server_weight.div(2) -%>
 <% end -%>
 <% end -%>


@@ -52,30 +52,48 @@ map $http_user_agent $approved_scraper {
 map $http_user_agent $denied_scraper {
   default                0; # Not denied
   ''                     1; # No User-Agent Set
 map $http_user_agent $denied_scraper {
   default                0; # Not denied
   ''                     1; # No User-Agent Set

-  '~^Python\-urllib\/'   1; # Library Default
-  '~^python\-requests\/' 1; # Library Default
-  '~^node\-fetch\/'      1; # Library Default
-  '~^R$'                 1; # Library Default
-  '~^Java\/'             1; # Library Default
-  '~^tiles$'             1; # Library Default
-  '~^okhttp\/'           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
-  'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)' 1;  # Fake
-  '~^runtastic'          1; # App
-  '~^Where\ my\ children' 1; # App
-  'nossoonibusjp.android.crosswalk' 1; # App
-  'br.com.concisoti.potybus' 1; # App
+  '-'                    1;
+
+  # Library defaults
+  '~^Python\-urllib\/'   1;
+  '~^python\-requests\/' 1;
+  '~^node\-fetch\/'      1;
+  '~^R$'                 1;
+  '~^Java\/'             1;
+  '~^tiles$'             1;
+  '~^okhttp\/'           1;
+  '~^Microsoft-ATL-Native\/' 1;
+  '/n software IPWorks HTTP/S Component - www.nsoftware.com' 1;
+  '~^Wget\/'             1;
+  'java'                 1;
+
+  # Library defaults or fakes
+  'Android'              1;
+  'kc_android'           1;
+  'host'                 1;
+  '~^maptestapp'         1;
+  'Other'                1;
+  'osmdroid'             1;
+  '~^tilelive-http'      1;
+  '~^Java-http-client'   1;
+
+  # Fakes
+  'Mozilla/4.0'          1;
+  'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)' 1;
+
+  # Bulk downloaders
+  'C# TilesDownloader'   1;
+  'MapDownloader'        1;
+  '~^staticmaps'         1;
+
+  # Overusage apps
+  '~^runtastic'          1;
+  '~^Where\ my\ children' 1;
+  'nossoonibusjp.android.crosswalk' 1;
+  'br.com.concisoti.potybus' 1;

   'com.soft373.taptaxi'  1;
   'com.kradac.ktxcore'   1;
   'com.soft373.taptaxi'  1;
   'com.kradac.ktxcore'   1;

-  'ru.crowdsystems.topcontrol.knd' 1;
+  '~^ru.crowdsystems.topcontrol.knd' 1;

   'pl.itaxi.driver'      1;
   'net.uztaxi.driver'    1;
   'OSMDroid/2.1 (its; rutaxi 3.28.0)' 1;
   'pl.itaxi.driver'      1;
   'net.uztaxi.driver'    1;
   'OSMDroid/2.1 (its; rutaxi 3.28.0)' 1;


@@ -83,44 +101,67 @@ map $http_user_agent $denied_scraper {
   'ru.taximaster.www'    1;
   'com.arobs.trackgps'   1;
   'com.helleniccomms.asteras.driver' 1;
   'ru.taximaster.www'    1;
   'com.arobs.trackgps'   1;
   'com.helleniccomms.asteras.driver' 1;

+
+  # Malware
+  'Agent Smith'          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
   # '~[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
-  '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
-  '~^https?://[^.]*\.fastpokemap\.com/'  1; # Too much traffic
-  '~^https?://pkget\.com/'               1; # Too much traffic
-  '~^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
+  # Faked sites
+  'http://www.openstreetmap.org/'  1;
+  'http://www.openstreetmap.org'   1;
+  'https://www.openstreetmap.org'  1;
+  'http://openstreetmap.org/'      1;
+  'http://openstreetmap.org'       1;
+  'https://openstreetmap.org'      1;
+  'http://www.osm.org/'            1;
+  'http://www.osm.org'             1;
+  'http://osm.org/'                1;
+  'http://osm.org'                 1;
+  'http://google.com'              1;
+  'http://www.google.com'          1;
+  'http://google.com/'             1;
+  'http://www.google.com/'         1;
+  'https://google.com'             1;
+  'https://www.google.com'         1;
+  'https://google.com/'            1;
+  'https://www.google.com/'        1;
+  'http://www.microsoft.com/'      1;
+
+  # Overusing websites
+  '~^https?://pmap\.kuku\.lu/'           1;
+  '~^https?://[^.]*\.pmap\.kuku\.lu/'    1;
+  '~^https?://fastpokemap\.com/'         1;
+  '~^https?://[^.]*\.fastpokemap\.com/'  1;
+  '~^https?://pkget\.com/'               1;
+  '~^https?://[^.]*\.pkget\.com/'        1;
+  '~^https?://twpkinfo\.com/'            1;
+  '~^https?://[^.]*\.twpkinfo\.com/'     1;
+  '~^https?://9db\.jp/'                  1;
+  '~^https?://[^.]*\.9db\.jp/'           1;
+  '~^https?://clustrmaps\.com/'          1;
+  '~^https?://[^.]*\.clustrmaps\.com/'   1;
+  '~^https?://geoportal360\.pl/'         1;
+  '~^https?://skelbiu\.lt/'              1;
+  '~^https?://[^.]*\.skelbiu\.lt/'       1;
+  '~^https?://wialon\.[^.]*/'            1; # wialon has many domains, so block them all
+  '~^https?://[^.]*\.wialon\.[^.]*/'     1;
+  '~^https?://gps-trace\.com/'           1;
+  '~^https?://[^.]*\.gps-trace\.com/'    1;
+  '~^https?://cellmapper\.net/'          1;
+  '~^https?://[^.]*\.cellmapper\.net/'   1;
+}
+
+map $http_referer $censored_referer {
+  default                                 0; # Not denied
+  # Blocked on board instructions
+  '~^https?://schiebt-sie-ab\.de/'        1;
+  '~^https?://[^.]*\.schiebt-sie-ab\.de/' 1;

 }
 
 }
 

+

 map $http_referer $osm_referer {
   default                                 '';    # False
   '~^https:\/\/www\.openstreetmap\.org\/' 'osm'; # True
 map $http_referer $osm_referer {
   default                                 '';    # False
   '~^https:\/\/www\.openstreetmap\.org\/' 'osm'; # True


@@ -159,11 +200,11 @@ map $tile_cache$http_referer$scheme$http_user_agent $deny_missing_referer {
 
 server {
     # IPv4
 
 server {
     # IPv4

-    listen       80 deferred backlog=16384 reuseport fastopen=2048 default_server;
-    listen       443 ssl deferred backlog=16384 reuseport fastopen=2048 http2 default_server;
+    listen       80 deferred backlog=16384 reuseport default_server;
+    listen       443 ssl deferred backlog=16384 reuseport http2 default_server;

     # IPv6
     # IPv6

-    listen       [::]:80 deferred backlog=16384 reuseport fastopen=2048 default_server;
-    listen       [::]:443 ssl deferred backlog=16384 reuseport fastopen=2048 http2 default_server;
+    listen       [::]:80 deferred backlog=16384 reuseport default_server;
+    listen       [::]:443 ssl deferred backlog=16384 reuseport http2 default_server;

     server_name  localhost;
 
     proxy_buffers 8 64k;
     server_name  localhost;
 
     proxy_buffers 8 64k;


@@ -184,31 +225,64 @@ server {
 <% end %>
 
     # Immediately 404 silly tile requests
 <% end %>
 
     # Immediately 404 silly tile requests

+    location = /0/-1/-1.png {
+      return 404;
+    }
+    location = /0/-1/0.png {
+      return 404;
+    }
+    location = /0/-1/1.png {
+      return 404;
+    }

     location = /0/0/-1.png {
       return 404;
     }
     location = /0/0/-1.png {
       return 404;
     }

-    location = /1/0/-1.png {
+    location = /0/0/1.png {

       return 404;
     }
       return 404;
     }

-    location = /1/-1/0.png {
+    location = /0/0/2.png {

       return 404;
     }
       return 404;
     }

-    location = /1/-1/1.png {
+    location = /0/1/-1.png {
+      return 404;
+    }
+    location = /0/1/0.png {
+      return 404;
+    }
+    location = /0/1/1.png {
+      return 404;
+    }
+    location = /0/1/2.png {
+      return 404;
+    }
+    location = /0/2/0.png {
+      return 404;
+    }
+    location = /0/2/1.png {
+      return 404;
+    }
+    location = /0/2/2.png {

       return 404;
     }
     location = /1/-1/-1.png {
       return 404;
     }
       return 404;
     }
     location = /1/-1/-1.png {
       return 404;
     }

+    location = /1/-1/0.png {
+      return 404;
+    }
+    location = /1/-1/1.png {
+      return 404;
+    }

     location = /1/-1/2.png {
       return 404;
     }
     location = /1/-1/2.png {
       return 404;
     }

-    location = /1/1/-1.png {
+    location = /1/0/-1.png {

       return 404;
     }
       return 404;
     }

-    location = /1/2/-1.png {
+    location = /1/1/-1.png {

       return 404;
     }
       return 404;
     }

-    location = /2/0/-1.png {
+    location = /1/2/-1.png {

       return 404;
     }
     location = /2/-1/0.png {
       return 404;
     }
     location = /2/-1/0.png {


@@ -217,13 +291,40 @@ server {
     location = /2/-1/1.png {
       return 404;
     }
     location = /2/-1/1.png {
       return 404;
     }

+    location = /2/-1/2.png {
+      return 404;
+    }
+    location = /2/-1/3.png {
+      return 404;
+    }
+    location = /2/0/-1.png {
+      return 404;
+    }

     location = /2/1/-1.png {
       return 404;
     }
     location = /2/1/-1.png {
       return 404;
     }

-    location = /2/-1/2.png {
+    location = /2/1/4.png {

       return 404;
     }
       return 404;
     }

-    location = /2/-1/3.png {
+    location = /2/2/4.png {
+      return 404;
+    }
+    location = /2/3/4.png {
+      return 404;
+    }
+    location = /2/4/0.png {
+      return 404;
+    }
+    location = /2/4/1.png {
+      return 404;
+    }
+    location = /2/4/2.png {
+      return 404;
+    }
+    location = /2/4/3.png {
+      return 404;
+    }
+    location = /2/4/4.png {

       return 404;
     }
 
       return 404;
     }
 


@@ -251,25 +352,9 @@ server {
 
       # Replace host header.
       proxy_set_header Host 'tile.openstreetmap.org';
 
       # Replace host header.
       proxy_set_header Host 'tile.openstreetmap.org';

-      # Do not pass cookies to backends.
-      proxy_set_header Cookie '';
-      # Do not pass Accept-Encoding to backends.
-      proxy_set_header Accept-Encoding '';
-      # Do not pass Accept to backends.
-      proxy_set_header Accept '';
-      # Do not pass Accept-Language to backends as unused.
-      proxy_set_header Accept-Language '';
-      proxy_set_header Accept-Charset '';
-      # Do not send origin, we allow all.
-      proxy_set_header origin '';
-      # Do not pass invalid headers to backend.
-      proxy_set_header X-Forwarded-Host '';
-      proxy_set_header X-Host '';
-      proxy_set_header Authorization '';
-      proxy_set_header Proxy-Authorization '';
-
-      # Drop partial requests
-      proxy_set_header range '';
+      # Drop all request headers and request body
+      proxy_pass_request_headers off;
+      proxy_pass_request_body off;

 
       # Do not allow setting cookies from backends due to caching.
       proxy_ignore_headers Set-Cookie;
 
       # Do not allow setting cookies from backends due to caching.
       proxy_ignore_headers Set-Cookie;


@@ -328,6 +413,11 @@ server {
         return 418;
       }
 
         return 418;
       }
 

+      if ($censored_referer) {
+        set $limit_rate 512;
+        return 451 "Unavailable at OSMF Board request";
+      }
+

       # Strip any ?query parameters from urls
       set $args '';
 
       # Strip any ?query parameters from urls
       set $args '';