Run pluto through bundler

[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 080c7998d9a7ac662f412acdb11be338959354d8..6c03797d17ee17e380b3bf40fa2fc841ae5189e5 100644 (file)
--- a/cookbooks/tilecache/templates/default/squid.conf.erb
+++ b/cookbooks/tilecache/templates/default/squid.conf.erb
@@ -105,11 +105,11 @@ acl tile_caches src <%= address %>
 <% end -%>
 <% end -%>
 
 <% end -%>
 <% end -%>
 

+<% if node[:squid][:version] == "2" -%>

 #Siblings
 <% node[:tilecache][:tile_siblings].each do |sibling| -%>
 cache_peer <%= sibling %> sibling 3128 3130 weight=1500
 #Siblings
 <% node[:tilecache][:tile_siblings].each do |sibling| -%>
 cache_peer <%= sibling %> sibling 3128 3130 weight=1500

-cache_peer_access <%= sibling %> deny tile_caches
-cache_peer_access <%= sibling %> deny osmtile_thishost
+<% end -%>

 <% end -%>
 
 #Primary Parent
 <% end -%>
 
 #Primary Parent