From: Tom Hughes <tom@compton.nu>
Date: Tue, 29 Oct 2019 21:15:59 +0000 (+0000)
Subject: Disallow ICP access to squid 4 caches
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/592b5db20d62ec88bbeafa73b7e5b3da32254535

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 2cf9db393..4b1145497 100644
--- 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