X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/8fef504b800523a2b99f53f5ffd2db1661417dc5..fa50a84060d31d9a343e113f4b5cc143a9f8bcef:/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 2cf9db393..2184b1be5 100644 --- a/cookbooks/tilecache/templates/default/squid.conf.erb +++ b/cookbooks/tilecache/templates/default/squid.conf.erb @@ -119,7 +119,7 @@ acl tile_caches src <%= address %> # Siblings <% node[:tilecache][:tile_siblings].each do |sibling| -%> -cache_peer <%= sibling %> sibling 3128 3130 weight=1500 +cache_peer <%= sibling %> sibling 3128 4827 htcp weight=1500 <% end -%> # Primary Parent @@ -154,9 +154,11 @@ acl pool_unlimited src 212.98.173.54 #Allow tile_caches HTCP access htcp_access allow tile_caches +<% if node[:squid][:version] < 4 -%> #Allow tile_caches ICP access icp_access allow tile_caches +<% end %> <% (0..127).each do |i| -%> acl pool_<%= sprintf("%03d", 2*i) %> src <%= 2*i %>.0.0.0/7