From 6ec5e0f8e3b7f94a096c6251695eb30996bb627a Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Wed, 18 Dec 2013 12:25:23 +0000 Subject: [PATCH] Revert "Tilecache: breakout render parents to avoid squid roundrobin DNS issue" This reverts commit 9dce3290df98d37eafe424fee505bde9a7384862. --- .../tilecache/templates/default/squid.conf.erb | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/cookbooks/tilecache/templates/default/squid.conf.erb b/cookbooks/tilecache/templates/default/squid.conf.erb index 5f76aec8b..5ddd3d4ca 100644 --- a/cookbooks/tilecache/templates/default/squid.conf.erb +++ b/cookbooks/tilecache/templates/default/squid.conf.erb @@ -45,16 +45,13 @@ 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_access osmtileAccel allow osmtile_sites +cache_peer render.openstreetmap.org parent 80 0 no-query originserver name=osmtileAccelBackup login=PASS connect-timeout=60 no-digest weight=10 -#Backup Parents -<% @caches.each do |cache| -%> -cache_peer <%= cache.hostname %>.render.openstreetmap.org parent 80 0 no-query originserver name=osmtileAccelBackup<%= cache.hostname %> login=PASS connect-timeout=60 no-digest weight=10 -cache_peer_access osmtileAccelBackup<%= cache.hostname %> allow osmtile_sites -<% end -%> +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 -- 2.43.2