X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/327595ecd12ad781b680d8ca5d388519a0b54588..bc8a8796e6bddb440b81a49beb8e4909b5870b33:/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 c4a1a951b..83c906349 100644
--- a/cookbooks/tilecache/templates/default/squid.conf.erb
+++ b/cookbooks/tilecache/templates/default/squid.conf.erb
@@ -1,8 +1,20 @@
 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 ^$
+acl osmtileScrapers browser ^MOBAC
+acl osmtileScrapers browser ^JTileDownloader
+acl osmtileScrapers browser ^Apache\-HttpClient
+acl osmtileScrapers browser ^Opera\/10\.00
+acl osmtileScrapers browser ^shipxy01
+acl osmtileScrapers browser ^OsmAnd
+#acl osmtileScrapers browser ^apemap #CGI143. Whitelist for 1 week
+acl osmtileScrapers browser Firefox\/2\.0\.0\.11$
+acl osmtileScrapers browser Firefox\/3\.5\.7$
+acl osmtileScrapers browser Firefox\/3\.6$
+acl osmtileScrapers browser ^Mozilla\/5\.0$
+acl osmtileScrapers browser ^User\-Agent
+http_access deny osmtile_sites osmtileScrapers
 
 acl whitelist_path urlpath_regex ^/cgi-bin/(export|debug)$
 acl blacklist_path urlpath_regex ^/cgi-bin/
@@ -29,21 +41,8 @@ http_access allow osmtile_sites
 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 proxy-only
-<% end -%>
-<% if node[:fqdn] == "fume.openstreetmap.org" -%>
-cache_peer trogdor.openstreetmap.org sibling 3128 3130 proxy-only
-<% 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