X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/9457cdd43375bbe2493fe838739227851ac084c1..fa50a84060d31d9a343e113f4b5cc143a9f8bcef:/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 b6dd8fea8..2184b1be5 100644
--- a/cookbooks/tilecache/templates/default/squid.conf.erb
+++ b/cookbooks/tilecache/templates/default/squid.conf.erb
@@ -1,4 +1,5 @@
-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.name %>
+acl osmtile_sites dstdomain <%= node.name %> 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 ^$
@@ -8,13 +9,14 @@ 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 ^Mozilla\/4\.0$
+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 ^User\-Agent
 acl osmtileScrapers browser Firefox\/0\.8$
 acl osmtileScrapers browser Firefox\/1\.0$
@@ -24,10 +26,8 @@ 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$
-# 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
@@ -39,6 +39,13 @@ 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 osmtileScrapers browser ^Python\-urllib\/
+acl osmtileScrapers browser ^python\-requests\/
+acl osmtileScrapers browser ^node\-fetch\/
+acl osmtileScrapers browser ^R$
+acl osmtileScrapers browser ^Java\/
+acl osmtileScrapers browser ^tiles$
+acl osmtileScrapers browser ^runtastic
 
 acl is_fake_browser browser Firefox\/3\.0
 acl is_fake_browser browser Firefox\/4\.0
@@ -61,6 +68,12 @@ acl osmtileOverusers referer_regex ^https?://[^.]*\.fastpokemap\.com/
 acl osmtileOverusers referer_regex ^https?://pkget\.com/
 acl osmtileOverusers referer_regex ^https?://[^.]*\.pkget\.com/
 
+# Faked OSM referers
+acl osmtileOverusers referer_regex ^http://www\.openstreetmap\.org/?$
+acl osmtileOverusers referer_regex ^http://openstreetmap\.org/?$
+acl osmtileOverusers referer_regex ^http://www\.osm\.org/?$
+acl osmtileOverusers referer_regex ^http://osm\.org/?$
+
 http_access deny osmtile_sites osmtileOverusers
 
 # Delay pool when !has_referer and is_browser
@@ -98,28 +111,54 @@ http_access allow osmtile_sites requestMethodGet
 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 -%>
+
+# 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
 <% 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
 cache_peer_access osmtileAccel allow osmtile_sites
 
-#----------------------------------
-#Create an unlimited pool for cache IP addresses
+# Backup Parents
+<% @renders.each do |renders| -%>
+<% if node[:squid][:version] < 4 -%>
+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
+<% else -%>
+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 tls tlsdomain=render.openstreetmap.org
+<% end -%>
+cache_peer_access osmtileAccelBackup<%= renders[:hostname] %> allow osmtile_sites
+<% end -%>
+
+# ----------------------------------
+# 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 -%>
 
 # Juno Minsk office - me@komzpa.net
 acl pool_unlimited src 212.98.173.54
 
+#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
+<% end %>
 
 <% (0..127).each do |i| -%>
 acl pool_<%= sprintf("%03d", 2*i) %> src <%= 2*i %>.0.0.0/7