From: Matt Amos Date: Sat, 27 Aug 2016 16:52:32 +0000 (+0100) Subject: Merge delay pools for faked browsers and no-referer. This should re-enable delay... X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/f6ba704c4a2c12c7eb71eda60ab88cfef12ac73b Merge delay pools for faked browsers and no-referer. This should re-enable delay pools for no-referers. --- diff --git a/cookbooks/tilecache/templates/default/squid.conf.erb b/cookbooks/tilecache/templates/default/squid.conf.erb index 9f973a9d8..ed2b04c17 100644 --- a/cookbooks/tilecache/templates/default/squid.conf.erb +++ b/cookbooks/tilecache/templates/default/squid.conf.erb @@ -142,19 +142,13 @@ delay_class <%= i %> 3 #bit mask # xxxxxxx- -------- xxxxxxxx xxxxxxxx -# small pools for faked browsers -<% (0..127).each do |i| -%> -delay_access <%= i+1 %> allow pool_<%= sprintf("%03d", 2*i) %> !pool_unlimited is_fake_browser osmtile_sites -delay_access <%= i+1 %> deny all -delay_parameters <%= i+1 %> -1/-1 <%= node[:tilecache][:net_bucket_refill] / 30 %>/<%= node[:tilecache][:net_bucket_size] / 30 %> <%= node[:tilecache][:ip_bucket_refill] / 30 %>/<%= node[:tilecache][:ip_bucket_size] / 30 %> -<% end %> - # small pools for !has_referer && is_browser - designed to slow down anyone # using no-referer to bypass blocks due to abusive levels of use. <% (0..127).each do |i| -%> +delay_access <%= i+1 %> allow pool_<%= sprintf("%03d", 2*i) %> !pool_unlimited is_fake_browser osmtile_sites delay_access <%= i+1 %> allow pool_<%= sprintf("%03d", 2*i) %> !pool_unlimited !has_referer is_browser osmtile_sites delay_access <%= i+1 %> deny all -delay_parameters <%= i+1 %> -1/-1 <%= node[:tilecache][:net_bucket_refill] / 10 %>/<%= node[:tilecache][:net_bucket_size] / 10 %> <%= node[:tilecache][:ip_bucket_refill] / 10 %>/<%= node[:tilecache][:ip_bucket_size] / 10 %> +delay_parameters <%= i+1 %> -1/-1 <%= node[:tilecache][:net_bucket_refill] / 30 %>/<%= node[:tilecache][:net_bucket_size] / 30 %> <%= node[:tilecache][:ip_bucket_refill] / 30 %>/<%= node[:tilecache][:ip_bucket_size] / 30 %> <% end %> # bigger pools for users providing a referer (assuming it's not blocked)