X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/327595ecd12ad781b680d8ca5d388519a0b54588..c5e6a12d2f2a66c52fa757c03fa2808859224de0:/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..663526724 100644 --- a/cookbooks/tilecache/templates/default/squid.conf.erb +++ b/cookbooks/tilecache/templates/default/squid.conf.erb @@ -2,6 +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 +#acl osmtileScrapers browser ^Apache\-HttpClient #http_access deny osmtile_sites osmtileScrapers acl whitelist_path urlpath_regex ^/cgi-bin/(export|debug)$ @@ -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 -<% 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