-acl osmtile_sites dstdomain a.tile.openstreetmap.org b.tile.openstreetmap.org c.tile.openstreetmap.org tile.openstreetmap.org a.tile.osm.org b.tile.osm.org c.tile.osm.org tile.osm.org
+acl osmtile_thishost dstdomain <%= node[:fqdn] %>
+acl osmtile_sites dstdomain <%= node[:fqdn] %> a.tile.openstreetmap.org b.tile.openstreetmap.org c.tile.openstreetmap.org tile.openstreetmap.org a.tile.osm.org b.tile.osm.org c.tile.osm.org tile.osm.org
acl osmtiles_png urlpath_regex .png$
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
-#acl osmtileScrapers browser ^apemap #CGI143 + Email. Whitelist for 1 week
+# acl osmtileScrapers browser ^OsmAnd #Victor + Email. Whitelist for 1 week
+# acl osmtileScrapers browser ^apemap #CGI143 + Email. Whitelist for 1 week
acl osmtileScrapers browser Firefox\/2\.0\.0\.11$
-#acl osmtileScrapers browser Firefox\/3\.5\.7$ #CGI285 + Email. Whitelist for 1 week
+acl osmtileScrapers browser Firefox\/3\.5\.7$
acl osmtileScrapers browser Firefox\/3\.6$
acl osmtileScrapers browser ^Mozilla\/5\.0$ #QLandkarte unwilling to set a real user-agent.
acl osmtileScrapers browser ^Mozilla$ #Intentionally faked user-agent
acl osmtileScrapers browser MSIE.5.5
acl osmtileScrapers browser ^LoadOSM\.exe$
acl osmtileScrapers browser ^app_name$
-# 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 ^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 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/
acl osmtile_nocache_url urlpath_regex \.png/(status|dirty)$
cache deny osmtile_sites osmtile_nocache_url
+<% @caches.each do |cache| -%>
+<% cache.ipaddresses(:family => :inet, :role => :external).sort.each do |address| -%>
+acl tile_caches src <%= address %>
+<% end -%>
+<% end -%>
+
+<% if node[:squid][:version] == "2" -%>
+# Siblings
<% 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=120 no-digest weight=1000
+<% end -%>
+
+# Primary Parent
+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
cache_peer_access osmtileAccel allow osmtile_sites
-#Backup Parents
+# Backup Parents
<% @renders.each do |renders| -%>
-cache_peer <%= renders[:hostname] %>.render.openstreetmap.org parent 80 0 no-query originserver name=osmtileAccelBackup<%= renders[:hostname] %> login=PASS connect-timeout=60 no-digest weight=10
+cache_peer <%= renders[:hostname] %>.render.openstreetmap.org parent 443 0 no-query originserver name=osmtileAccelBackup<%= renders[:hostname] %> login=PASS connect-timeout=60 no-digest weight=10 ssl ssldomain=render.openstreetmap.org
cache_peer_access osmtileAccelBackup<%= renders[:hostname] %> allow osmtile_sites
<% end -%>
-#----------------------------------
-#Create an unlimited pool for cache IP addresses
+# ----------------------------------
+# Create an unlimited pool for cache IP addresses
acl pool_unlimited src 127.0.0.1
<% @caches.each do |cache| -%>
<% cache.ipaddresses(:family => :inet, :role => :external).sort.each do |address| -%>
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
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] / 30 %>/<%= node[:tilecache][:net_bucket_size] / 30 %> <%= node[:tilecache][:ip_bucket_refill] / 30 %>/<%= node[:tilecache][:ip_bucket_size] / 30 %>
+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 %>
<% end %>
# bigger pools for users providing a referer (assuming it's not blocked)
projects / chef.git / blobdiff