X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/93c098cdc4f22b1fe69ecd88b3ac2d2b211780ff..7aa758eedfd84af0109dd7849ccb2ad54da29149:/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 95d7b8b8c..c8cace7a8 100644
--- a/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
+++ b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
@@ -3,7 +3,18 @@
 upstream tile_cache_backend {
     server 127.0.0.1;
 
-    keepalive 32;
+    # Add the other caches to relieve pressure if local squid failing
+    # Balancer: round-robin
+<% @caches.each do |cache| -%>
+<% if cache[:hostname] != node[:hostname] -%>
+    # Server <%= cache[:hostname] %>
+<% cache.ipaddresses(:family => :inet, :role => :external).sort.each do |address| -%>
+    server <%= address %> backup;
+<% end -%>
+<% end -%>
+<% end -%>
+
+    keepalive 256;
 }
 
 # Rates table based on current cookie value
@@ -51,7 +62,7 @@ server {
       proxy_http_version 1.1;
       proxy_set_header Connection '';
 
-      proxy_connect_timeout 5s;
+      proxy_connect_timeout 10s;
 
       # Preserve host header.
       proxy_set_header Host $host;
@@ -79,7 +90,7 @@ server {
 
       # Allow Higher Traffic Rate from Approved User-Agents which do not support cookies (uses nginx Map)
       if ($approved_scraper) {
-        set $limit_rate 32768;
+        set $limit_rate 65536;
       }
 
       # Strip any ?query parameters from urls