From: Grant Slater <git@firefishy.com>
Date: Fri, 23 Aug 2013 14:57:55 +0000 (+0100)
Subject: Tilecache: add fallback to cache parents
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/db7051b318fcb10eae371336cf78821625ac8dac

Tilecache: add fallback to cache parents
---

diff --git a/cookbooks/tilecache/templates/default/squid.conf.erb b/cookbooks/tilecache/templates/default/squid.conf.erb
index 0d6ea1099..1a23b4022 100644
--- a/cookbooks/tilecache/templates/default/squid.conf.erb
+++ b/cookbooks/tilecache/templates/default/squid.conf.erb
@@ -9,15 +9,17 @@ cache deny osmtile_sites osmtile_nocache_url
 <% if node[:fqdn] == "nadder-01.openstreetmap.org" || node[:fqdn] == "nadder-02.openstreetmap.org" -%> 
 <% @caches.each do |cache| -%>
 <% cache.ipaddresses(:family => :inet, :role => :external).sort.each do |address| -%>
-#cache_peer <%= address %> sibling 3128 3130 background-ping weighted-round-robin
+#cache_peer <%= address %> sibling 3128 3130
 <% end -%>
 <% end -%>
 <% end -%>
 cache_peer <%= node[:tilecache][:tile_parent] %> parent 80 0 no-query originserver name=osmtileAccel login=PASS connect-timeout=60 no-digest weight=1000
-#cache_peer render.openstreetmap.org parent 80 0 no-query originserver name=osmtileAccel login=PASS connect-timeout=60 no-digest weight=10
+cache_peer render.openstreetmap.org parent 80 0 no-query originserver name=osmtileAccelBackup login=PASS connect-timeout=60 no-digest weight=10
 
 cache_peer_access osmtileAccel allow osmtile_sites
+cache_peer_access osmtileAccelBackup allow osmtile_sites
 cache_peer_access osmtileAccel deny all
+cache_peer_access osmtileAccelBackup deny all
 
 #----------------------------------
 #Create an unlimited pool for cache IP addresses