X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/985c2fc143fde1f5c74b587a617baf79e8c58db1..f1f08456269c816dc488e5a8d45d4e88b2ca4148:/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 e2f74b6e8..0d6ea1099 100644
--- a/cookbooks/tilecache/templates/default/squid.conf.erb
+++ b/cookbooks/tilecache/templates/default/squid.conf.erb
@@ -6,24 +6,32 @@ http_access allow osmtile_sites
 acl osmtile_nocache_url urlpath_regex \.png/(status|dirty)$
 cache deny osmtile_sites osmtile_nocache_url
 
-cache_peer <%= node[:tilecache][:tile_parent] %> parent 80 0 no-query originserver name=osmtileAccel login=PASS connect-timeout=90 no-digest
-cache_peer yevaud.openstreetmap.org parent 80 0 no-query originserver name=osmtileFileAccel login=PASS connect-timeout=90 no-delay no-digest max-conn=30
+<% 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 -%>
+<% 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_access osmtileAccel allow osmtile_sites osmtiles_png
+cache_peer_access osmtileAccel allow osmtile_sites
 cache_peer_access osmtileAccel deny all
 
-cache_peer_access osmtileFileAccel allow osmtile_sites !osmtiles_png
-cache_peer_access osmtileFileAccel deny all
-
 #----------------------------------
 #Create an unlimited pool for cache IP addresses
 acl pool_unlimited src 127.0.0.1
 <% @caches.each do |cache| -%>
-<% cache.ipaddresses(:family => :inet, :role => :external) do |address| -%>
+<% cache.ipaddresses(:family => :inet, :role => :external).sort.each do |address| -%>
 acl pool_unlimited src <%= address %>
+acl tile_caches src <%= address %>
 <% end -%>
 <% end -%>
 
+#Allow tile_caches ICP access
+icp_access allow tile_caches
+
 acl pool_000 src 0.0.0.0/7
 acl pool_002 src 2.0.0.0/7
 acl pool_004 src 4.0.0.0/7