X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/592b5db20d62ec88bbeafa73b7e5b3da32254535..e45623f4f4d32626d7a336bcc310894e731863b2:/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 4b1145497..aa3af2ff9 100644 --- a/cookbooks/tilecache/templates/default/squid.conf.erb +++ b/cookbooks/tilecache/templates/default/squid.conf.erb @@ -119,14 +119,14 @@ acl tile_caches src <%= address %> # Siblings <% node[:tilecache][:tile_siblings].each do |sibling| -%> -cache_peer <%= sibling %> sibling 3128 3130 weight=1500 +cache_peer <%= sibling %> sibling 3128 4827 htcp weight=1500 <% end -%> # Primary Parent <% if node[:squid][:version] < 4 -%> cache_peer <%= node[:tilecache][:tile_parent] %> parent 443 0 no-query originserver name=osmtileAccel login=PASS connect-timeout=120 no-digest weight=1000 ssl ssldomain=render.openstreetmap.org <% else -%> -cache_peer <%= node[:tilecache][:tile_parent] %> parent 443 0 no-query originserver name=osmtileAccel login=PASS connect-timeout=120 no-digest weight=1000 tls tlsdomain=render.openstreetmap.org +cache_peer <%= node[:tilecache][:tile_parent] %> parent 443 0 no-query originserver name=osmtileAccel login=PASS connect-timeout=120 no-digest weight=1000 tls tlsdomain=render.openstreetmap.org standby=32 <% end -%> cache_peer_access osmtileAccel allow osmtile_sites @@ -151,10 +151,10 @@ acl pool_unlimited src <%= address %> # Juno Minsk office - me@komzpa.net acl pool_unlimited src 212.98.173.54 +<% if node[:squid][:version] < 4 -%> #Allow tile_caches HTCP access htcp_access allow tile_caches -<% if node[:squid][:version] < 4 -%> #Allow tile_caches ICP access icp_access allow tile_caches