tilecache: remove fallback caches as peers

[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 8fe6cc4326d080c30b7bc50a37c2bbb5f5ebd87f..b6dd8fea86470f64537d8379df7f18679fde22dc 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
@@ -57,6 +58,8 @@ 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
 
@@ -102,12 +105,6 @@ cache_peer <%= sibling %> sibling 3128 3130 weight=1500
 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
 
-#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_access osmtileAccelBackup<%= renders[:hostname] %> allow osmtile_sites
-<% end -%>
-
 #----------------------------------
 #Create an unlimited pool for cache IP addresses
 acl pool_unlimited src 127.0.0.1
@@ -117,16 +114,7 @@ acl pool_unlimited src <%= address %>
 acl tile_caches src <%= address %>
 <% end -%>
 <% end -%>
-# 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