X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/f1f08456269c816dc488e5a8d45d4e88b2ca4148..2564c1eb5234070886a86c2f016d92bc84aa93f4:/cookbooks/tilecache/templates/default/squid.conf.erb

diff --git a/cookbooks/tilecache/templates/default/squid.conf.erb b/cookbooks/tilecache/templates/default/squid.conf.erb
index 0d6ea1099..fdd161091 100644
--- a/cookbooks/tilecache/templates/default/squid.conf.erb
+++ b/cookbooks/tilecache/templates/default/squid.conf.erb
@@ -6,18 +6,19 @@ http_access allow osmtile_sites
 acl osmtile_nocache_url urlpath_regex \.png/(status|dirty)$
 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
-<% end -%>
+<% if node[:fqdn] == "nadder-01.openstreetmap.org" -%>
+cache_peer nadder-02.openstreetmap.org sibling 3128 3130 proxy-only
 <% end -%>
+<% if node[:fqdn] == "nadder-02.openstreetmap.org" -%> 
+cache_peer nadder-01.openstreetmap.org sibling 3128 3130 proxy-only
 <% 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