Use HTCP for cache peer queries

[chef.git] / 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 d1478759ff81a68099dde4f29299e52fa0ca9f80..2184b1be5a66f0200c909f56dd492c0c7df5e2a7 100644 (file)
--- a/cookbooks/tilecache/templates/default/squid.conf.erb
+++ b/cookbooks/tilecache/templates/default/squid.conf.erb
@@ -117,11 +117,9 @@ acl tile_caches src <%= address %>
 <% end -%>
 <% end -%>
 
-<% if node[:squid][:version] != 3 -%>
 # Siblings
 <% node[:tilecache][:tile_siblings].each do |sibling| -%>
-cache_peer <%= sibling %> sibling 3128 3130 weight=1500
-<% end -%>
+cache_peer <%= sibling %> sibling 3128 4827 htcp weight=1500
 <% end -%>
 
 # Primary Parent
@@ -154,8 +152,13 @@ acl pool_unlimited src <%= address %>
 # Juno Minsk office - me@komzpa.net
 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