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 5a59e59c7a2273e404185a2caf25e32757656cdd..62f52f78db4c4d084f834d68ba47209e8afae400 100644 (file)
--- a/cookbooks/tilecache/templates/default/squid.conf.erb
+++ b/cookbooks/tilecache/templates/default/squid.conf.erb
@@ -1,8 +1,10 @@
 acl osmtile_sites dstdomain 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$
 
 acl osmtile_sites dstdomain 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$
 

-#acl osmtileScrapers browser ^offlinemap\-lite
-#http_access deny osmtile_sites osmtileScrapers
+acl osmtileScrapers browser ^offlinemap\-lite
+acl osmtileScrapers browser ^Wget
+acl osmtileScrapers browser ^Apache\-HttpClient
+http_access deny osmtile_sites osmtileScrapers

 
 acl whitelist_path urlpath_regex ^/cgi-bin/(export|debug)$
 acl blacklist_path urlpath_regex ^/cgi-bin/
 
 acl whitelist_path urlpath_regex ^/cgi-bin/(export|debug)$
 acl blacklist_path urlpath_regex ^/cgi-bin/


@@ -29,21 +31,8 @@ http_access allow osmtile_sites
 acl osmtile_nocache_url urlpath_regex \.png/(status|dirty)$
 cache deny osmtile_sites osmtile_nocache_url
 
 acl osmtile_nocache_url urlpath_regex \.png/(status|dirty)$
 cache deny osmtile_sites osmtile_nocache_url
 

-<% if node[:fqdn] == "nadder-01.openstreetmap.org" -%>
-cache_peer nadder-02.openstreetmap.org sibling 3128 3130 proxy-only
-<% end -%>
-<% if node[:fqdn] == "nadder-02.openstreetmap.org" -%> 
-cache_peer nadder-01.openstreetmap.org sibling 3128 3130 proxy-only
-<% end -%>
-<% if node[:fqdn] == "trogdor.openstreetmap.org" -%>
-cache_peer fume.openstreetmap.org sibling 3128 3130
-<% end -%>
-<% if node[:fqdn] == "fume.openstreetmap.org" -%>
-cache_peer trogdor.openstreetmap.org sibling 3128 3130
-<% end -%>
-<% if node[:fqdn] == "jakelong.openstreetmap.org" -%>
-cache_peer nadder-01.openstreetmap.org sibling 3128 3130 proxy-only
-cache_peer nadder-02.openstreetmap.org sibling 3128 3130 proxy-only
+<% node[:tilecache][:tile_siblings].each do |sibling| -%>
+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
 <% 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