Go back to serving http tiles directly from squid for now

[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 c897a5058e76d05afee664d103c0eb1bef99ad3b..8c2adc7c11ab04a1806b9c1a59ae75afb6674e6b 100644 (file)
--- 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
@@ -38,7 +39,7 @@ 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
@@ -62,21 +63,6 @@ acl osmtileOverusers referer_regex ^https?://[^.]*\.pkget\.com/
 
 http_access deny osmtile_sites osmtileOverusers
 
-acl osmexportOverusers src 60.199.131.39
-acl osmexportOverusers src 92.217.67.26
-acl osmexportOverusers src 103.53.208.109
-acl osmexportOverusers src 113.196.123.178
-acl osmexportOverusers src 118.193.51.194
-acl osmexportOverusers src 119.188.70.34
-acl osmexportOverusers src 165.228.125.15
-acl osmexportOverusers src 171.13.14.152
-acl osmexportOverusers src 171.15.132.56
-acl osmexportOverusers src 199.203.108.5
-acl osmexportOverusers src 210.209.89.127
-acl osmexportOverusers src 210.65.88.6
-
-http_access deny osmtile_sites osmexportOverusers
-
 # Delay pool when !has_referer and is_browser
 acl has_referer referer_regex .
 acl is_browser browser Chrome\/
@@ -116,12 +102,12 @@ cache deny osmtile_sites osmtile_nocache_url
 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
+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
 <% @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 -%>