Tilecache: breakout render parents to avoid squid roundrobin DNS issue

[chef.git] / 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 5ddd3d4ca06db8675a09a20fc773c394e018d605..5a59e59c7a2273e404185a2caf25e32757656cdd 100644 (file)
--- a/cookbooks/tilecache/templates/default/squid.conf.erb
+++ b/cookbooks/tilecache/templates/default/squid.conf.erb
@@ -45,13 +45,15 @@ cache_peer trogdor.openstreetmap.org sibling 3128 3130
 cache_peer nadder-01.openstreetmap.org sibling 3128 3130 proxy-only
 cache_peer nadder-02.openstreetmap.org sibling 3128 3130 proxy-only
 <% end -%>
+#Primary Parent
 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=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
+
+#Backup Parents
+<% @renders.each do |renders| -%>
+cache_peer <%= renders[:hostname] %>.render.openstreetmap.org parent 80 0 no-query originserver name=osmtileAccelBackup<%= renders[:hostname] %> login=PASS connect-timeout=60 no-digest weight=10
+cache_peer_access osmtileAccelBackup<%= renders[:hostname] %> allow osmtile_sites
+<% end -%>
 
 #----------------------------------
 #Create an unlimited pool for cache IP addresses