tilecache: remove redundant squid config

[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 4c8395fee516723ed390d8d52865d39cb944a554..eeb429401b1d08cdcc89c4bda7f8fab45ca38daf 100644 (file)
--- a/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
+++ b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
@@ -54,13 +54,21 @@ map $http_user_agent $denied_scraper {
   '~^Java\/'             1; # Library Default
   '~^tiles$'             1; # Library Default
   '~^okhttp\/'           1; # Library Default
-  '~^runtastic'          1; # App
+  '~^Microsoft-ATL-Native\/' 1; #Library Default
+  '/n software IPWorks HTTP/S Component - www.nsoftware.com' 1; #Library default
+  'C# TilesDownloader'   1; # Downloader
+  'MapDownloader'        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
+  'com.soft373.taptaxi'  1;
+  'com.kradac.ktxcore'   1;
+  'ru.crowdsystems.topcontrol.knd' 1;
 }
 
 map $http_referer $denied_referer {
@@ -73,6 +81,8 @@ map $http_referer $denied_referer {
   '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
   '~^https?://pmap\.kuku\.lu/'           1; # Too much traffic
   '~^https?://[^.]*\.pmap\.kuku\.lu/'    1; # Too much traffic
   '~^https?://fastpokemap\.com/'         1; # Too much traffic
@@ -187,7 +197,7 @@ server {
       return 404;
     }
 
-<% for i in 0..15 do %>
+<% for i in 0..16 do %>
 <% if i == 0 -%>
     # Default Fallback Location Handler (lowest)
     location / {
@@ -205,7 +215,7 @@ server {
       proxy_http_version 1.1;
       proxy_set_header Connection '';
 
-      proxy_connect_timeout 10s;
+      proxy_connect_timeout 20s;
 
       # Replace host header.
       proxy_set_header Host 'tile.openstreetmap.org';
@@ -237,15 +247,17 @@ server {
       # Caching
       proxy_cache "proxy_cache_zone";
       proxy_cache_lock on;
-      proxy_cache_valid 200 1d;
+      proxy_cache_valid 200 2d;
       proxy_cache_valid 404 15m;
       # Serve stale cache on errors or if updating
       proxy_cache_use_stale error timeout updating http_404 http_500 http_503 http_504;
       # If in cache as stale, serve stale and update in background
       proxy_cache_background_update on;
+      # Workaround nginx async bug which causes stale cache replies to wait for the async backend cache update reply (seen in v1.16.0)
+      keepalive_requests 0;
       # Enable revalidation using If-Modified-Since and If-None-Match for stale items
       proxy_cache_revalidate on;
-      proxy_cache_min_uses 8;
+      proxy_cache_min_uses 4;
 
       add_header x-cache-status $upstream_cache_status;
 <% end -%>