imagery: try keep memory usage under control

[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 bb62e8537c3a11624b3193d31ebe2b45fe4b27c6..6c03797d17ee17e380b3bf40fa2fc841ae5189e5 100644 (file)
--- a/cookbooks/tilecache/templates/default/squid.conf.erb
+++ b/cookbooks/tilecache/templates/default/squid.conf.erb
@@ -1,3 +1,4 @@
+acl osmtile_thishost dstdomain <%= node[:fqdn] %>
 acl osmtile_sites dstdomain <%= node[:fqdn] %> a.tile.openstreetmap.org b.tile.openstreetmap.org c.tile.openstreetmap.org tile.openstreetmap.org a.tile.osm.org b.tile.osm.org c.tile.osm.org tile.osm.org
 acl osmtiles_png urlpath_regex .png$
 
@@ -104,10 +105,11 @@ acl tile_caches src <%= address %>
 <% end -%>
 <% end -%>
 
+<% if node[:squid][:version] == "2" -%>
 #Siblings
 <% node[:tilecache][:tile_siblings].each do |sibling| -%>
 cache_peer <%= sibling %> sibling 3128 3130 weight=1500
-cache_peer_access <%= sibling %> deny tile_caches
+<% end -%>
 <% end -%>
 
 #Primary Parent