tilecache: only use cache peers as fallback upstream

diff --git a/cookbooks/tilecache/templates/default/nginx_tile.conf.erb b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
index 4c99dfb0eb7f85246d73cdfe77e9359386277ed1..b6873f39a24b08d8b5632a75daefd74476a9c60d 100644 (file)
--- a/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
+++ b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
@@ -7,10 +7,12 @@ upstream tile_cache_backend {
   # Balancer: round-robin
 <% @caches.each do |cache| -%>
 <% if cache[:hostname] != node[:hostname] -%>
   # Balancer: round-robin
 <% @caches.each do |cache| -%>
 <% if cache[:hostname] != node[:hostname] -%>

+<% if node[:tilecache][:tile_siblings].include? cache[:hostname] -%>

 <% cache.ipaddresses(:family => :inet, :role => :external).sort.each do |address| -%>
   server <%= address %> backup; # Server <%= cache[:hostname] %>
 <% end -%>
 <% end -%>
 <% cache.ipaddresses(:family => :inet, :role => :external).sort.each do |address| -%>
   server <%= address %> backup; # Server <%= cache[:hostname] %>
 <% end -%>
 <% end -%>

+<% end -%>

 <% end -%>
 
   keepalive 256;
 <% end -%>
 
   keepalive 256;


@@ -96,7 +98,7 @@ server {
       proxy_http_version 1.1;
       proxy_set_header Connection '';
 
       proxy_http_version 1.1;
       proxy_set_header Connection '';
 

-      proxy_connect_timeout 10s;
+      proxy_connect_timeout 5s;

 
       # Preserve host header.
       proxy_set_header Host $host;
 
       # Preserve host header.
       proxy_set_header Host $host;