tilecache: prefer cache siblings, allow caching of response hits

[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 de33c7969aa4dfb0f98c5dfc4a815d2c0866d4b2..62f52f78db4c4d084f834d68ba47209e8afae400 100644 (file)
--- a/cookbooks/tilecache/templates/default/squid.conf.erb
+++ b/cookbooks/tilecache/templates/default/squid.conf.erb
@@ -2,8 +2,8 @@ acl osmtile_sites dstdomain a.tile.openstreetmap.org b.tile.openstreetmap.org c.
 acl osmtiles_png urlpath_regex .png$
 
 acl osmtileScrapers browser ^offlinemap\-lite
-acl osmtileScrapers browser ^Wget/1
-acl osmtileScrapers browser ^Apache-HttpClient/UNAVAILABLE"
+acl osmtileScrapers browser ^Wget
+acl osmtileScrapers browser ^Apache\-HttpClient
 http_access deny osmtile_sites osmtileScrapers
 
 acl whitelist_path urlpath_regex ^/cgi-bin/(export|debug)$
@@ -32,7 +32,7 @@ acl osmtile_nocache_url urlpath_regex \.png/(status|dirty)$
 cache deny osmtile_sites osmtile_nocache_url
 
 <% node[:tilecache][:tile_siblings].each do |sibling| -%>
-cache_peer <%= sibling %> sibling 3128 3130 proxy-only
+cache_peer <%= sibling %> sibling 3128 3130 weight=1500
 <% end -%>
 #Primary Parent
 cache_peer <%= node[:tilecache][:tile_parent] %> parent 80 0 no-query originserver name=osmtileAccel login=PASS connect-timeout=60 no-digest weight=1000