Disallow ICP access to squid 4 caches

diff --git a/cookbooks/tilecache/templates/default/squid.conf.erb b/cookbooks/tilecache/templates/default/squid.conf.erb
index 2cf9db3937ccb8541420b3dc48f2f483086b5c3c..4b114549713ca93862f8ea4ee07cad5662f52c2e 100644 (file)
--- a/cookbooks/tilecache/templates/default/squid.conf.erb
+++ b/cookbooks/tilecache/templates/default/squid.conf.erb
@@ -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