From 2564c1eb5234070886a86c2f016d92bc84aa93f4 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Sat, 31 Aug 2013 20:17:33 +0100 Subject: [PATCH] Tilecache: hardcode nadder-01 <-> nadder-02 cache sibling peering for now --- cookbooks/tilecache/templates/default/squid.conf.erb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/cookbooks/tilecache/templates/default/squid.conf.erb b/cookbooks/tilecache/templates/default/squid.conf.erb index 1a23b4022..fdd161091 100644 --- a/cookbooks/tilecache/templates/default/squid.conf.erb +++ b/cookbooks/tilecache/templates/default/squid.conf.erb @@ -6,12 +6,11 @@ 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 -<% 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=osmtileAccelBackup login=PASS connect-timeout=60 no-digest weight=10 -- 2.39.5