tilecache: limit supported request methods

[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 2184b1be5a66f0200c909f56dd492c0c7df5e2a7..aa3af2ff900a52d5e63d50f7d62d6589be2b15f4 100644 (file)
--- a/cookbooks/tilecache/templates/default/squid.conf.erb
+++ b/cookbooks/tilecache/templates/default/squid.conf.erb
@@ -126,7 +126,7 @@ cache_peer <%= sibling %> sibling 3128 4827 htcp weight=1500
 <% 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 -%>
 <% 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
 
 <% 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
 
 # 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
 
 #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
 
 #Allow tile_caches ICP access
 icp_access allow tile_caches