X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/17fea9276c93b655d30063d70371e4e5a7a00619..2c13e97fd4d53a098147c6c6a975977534e02e2c:/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 518309361..b6ca8e419 100644 --- a/cookbooks/tilecache/templates/default/squid.conf.erb +++ b/cookbooks/tilecache/templates/default/squid.conf.erb @@ -5,6 +5,7 @@ acl osmtileScrapers browser ^$ acl osmtileScrapers browser ^MOBAC acl osmtileScrapers browser ^JTileDownloader acl osmtileScrapers browser ^Apache\-HttpClient +acl osmtileScrapers browser ^Go-http-client\/ acl osmtileScrapers browser ^Opera\/10\.00 acl osmtileScrapers browser ^shipxy01 #acl osmtileScrapers browser ^OsmAnd #Victor + Email. Whitelist for 1 week @@ -23,8 +24,33 @@ acl osmtileScrapers browser MSIE.7\.0.*Windows.NT.5\.1.*2\.0\.50727.$ acl osmtileScrapers browser MSIE.5.5 acl osmtileScrapers browser ^LoadOSM\.exe$ acl osmtileScrapers browser ^app_name$ -acl osmtileScrapers browser ^osmdroid$ # app using osmdroid library not setting app-specific User-Agent +# TEMPORARY unblock of osmdroid-based apps which should be setting their unique +# User-Agent, but aren't. Re-block on/near 2016-08-29. +#acl osmtileScrapers browser ^osmdroid$ # app using osmdroid library not setting app-specific User-Agent #acl osmtileScrapers browser ^Mozilla/5\.0 \(Windows NT 5\.1\)$ # Faked User-Agent +acl osmtileScrapers browser Firefox\/3\.0 +acl osmtileScrapers browser Firefox\/4\.0 +acl osmtileScrapers browser Firefox\/5\.0 +acl osmtileScrapers browser Firefox\/6\.0 +acl osmtileScrapers browser Firefox\/7\.0 +acl osmtileScrapers browser Firefox\/8\.0 +acl osmtileScrapers browser Firefox\/9\.0 +acl osmtileScrapers browser Firefox\/10\.0 +acl osmtileScrapers browser Firefox\/11\.0 +acl osmtileScrapers browser Firefox\/12\.0 +acl osmtileScrapers browser Firefox\/13\.0 + +acl is_fake_browser browser Firefox\/3\.0 +acl is_fake_browser browser Firefox\/4\.0 +acl is_fake_browser browser Firefox\/5\.0 +acl is_fake_browser browser Firefox\/6\.0 +acl is_fake_browser browser Firefox\/7\.0 +acl is_fake_browser browser Firefox\/8\.0 +acl is_fake_browser browser Firefox\/9\.0 +acl is_fake_browser browser Firefox\/10\.0 +acl is_fake_browser browser Firefox\/11\.0 +acl is_fake_browser browser Firefox\/12\.0 +acl is_fake_browser browser Firefox\/13\.0 http_access deny osmtile_sites osmtileScrapers @@ -32,12 +58,18 @@ acl osmtileOverusers referer_regex ^https?://pmap\.kuku\.lu/ acl osmtileOverusers referer_regex ^https?://[^.]*\.pmap\.kuku\.lu/ acl osmtileOverusers referer_regex ^https?://fastpokemap\.com/ acl osmtileOverusers referer_regex ^https?://[^.]*\.fastpokemap\.com/ +acl osmtileOverusers referer_regex ^https?://pkget\.com/ +acl osmtileOverusers referer_regex ^https?://[^.]*\.pkget\.com/ http_access deny osmtile_sites osmtileOverusers # Delay pool when !has_referer and is_browser acl has_referer referer_regex . -acl is_browser browser Mozilla +acl is_browser browser Chrome\/ +acl is_browser browser Firefox\/ +acl is_browser browser Trident\/ +acl is_browser browser Safari\/ +acl is_browser browser AppleWebKit\/ acl whitelist_path urlpath_regex ^/cgi-bin/(export|debug) acl blacklist_path urlpath_regex ^/cgi-bin/ @@ -88,30 +120,21 @@ acl pool_unlimited src <%= address %> acl tile_caches src <%= address %> <% end -%> <% end -%> -#AOL External (London Hack Weekend) -acl pool_unlimited src 64.236.163.23 -#SoTM-US 2014 -acl pool_unlimited src 66.78.217.141 -#SoTM-US 2014 Hack Day Red Cross -acl pool_unlimited src 162.6.86.34 -acl pool_unlimited src 162.6.86.35 -acl pool_unlimited src 162.6.86.36 -#Telenav Whitelist - mvexel -acl pool_unlimited src 108.60.98.6 -#SoTM-EU 2014 -acl pool_unlimited src 185.52.244.32/29 + +# Juno Minsk office - me@komzpa.net +acl pool_unlimited src 212.98.173.54 #Allow tile_caches ICP access icp_access allow tile_caches -<% (0..127).each do |i| %> +<% (0..127).each do |i| -%> acl pool_<%= sprintf("%03d", 2*i) %> src <%= 2*i %>.0.0.0/7 <% end %> delay_pools 256 delay_initial_bucket_level 25 -<% (1..256).each do |i| %> +<% (1..256).each do |i| -%> delay_class <%= i %> 3 <% end %> #bit mask @@ -119,7 +142,8 @@ delay_class <%= i %> 3 # 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| %> +<% (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 %> @@ -128,7 +152,7 @@ delay_parameters <%= i+1 %> -1/-1 <%= node[:tilecache][:net_bucket_refill] / 10 # bigger pools for users providing a referer (assuming it's not blocked) # or non-browser users. <% (0..127).each do |i| %> -delay_access <%= i+129 %> allow pool_<%= sprintf("%03d", 2*i)) %> !pool_unlimited osmtile_sites +delay_access <%= i+129 %> allow pool_<%= sprintf("%03d", 2*i) %> !pool_unlimited osmtile_sites delay_access <%= i+129 %> deny all delay_parameters <%= i+129 %> -1/-1 <%= node[:tilecache][:net_bucket_refill] %>/<%= node[:tilecache][:net_bucket_size] %> <%= node[:tilecache][:ip_bucket_refill] %>/<%= node[:tilecache][:ip_bucket_size] %> <% end %>