Whitelist SoTM-US 2014 external NAT address

[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 9b54ad7e11f0ca1e3fa274cf50f6a9295c96b8ef..0f87c53b08c88a216a45164334ea08c9da76fadd 100644 (file)
--- a/cookbooks/tilecache/templates/default/squid.conf.erb
+++ b/cookbooks/tilecache/templates/default/squid.conf.erb
@@ -7,15 +7,25 @@ acl osmtileScrapers browser ^JTileDownloader
 acl osmtileScrapers browser ^Apache\-HttpClient
 acl osmtileScrapers browser ^Opera\/10\.00
 acl osmtileScrapers browser ^shipxy01
 acl osmtileScrapers browser ^Apache\-HttpClient
 acl osmtileScrapers browser ^Opera\/10\.00
 acl osmtileScrapers browser ^shipxy01

-acl osmtileScrapers browser ^OsmAnd
-acl osmtileScrapers browser ^apemap
-acl osmtileScrapers browser Firefox\/2\.0\.0\.11
-acl osmtileScrapers browser Firefox\/3\.5\.7
-acl osmtileScrapers browser Firefox\/3\.6
-acl osmtileScrapers browser ^User-Agent
+#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\.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 ^User\-Agent
+acl osmtileScrapers browser Firefox\/0\.8$
+acl osmtileScrapers browser Firefox\/1\.0$
+acl osmtileScrapers browser Firefox\/1\.0\.7$
+acl osmtileScrapers browser K\-Meleon\/1\.02$
+acl osmtileScrapers browser MSIE.7\.0.*Windows.NT.5\.1.*2\.0\.50727.$
+acl osmtileScrapers browser MSIE.5.5
+acl osmtileScrapers browser ^LoadOSM\.exe$
+

 http_access deny osmtile_sites osmtileScrapers
 
 http_access deny osmtile_sites osmtileScrapers
 

-acl whitelist_path urlpath_regex ^/cgi-bin/(export|debug)$
+acl whitelist_path urlpath_regex ^/cgi-bin/(export|debug)

 acl blacklist_path urlpath_regex ^/cgi-bin/
 acl blacklist_path urlpath_regex ^/MyAdmin/
 acl blacklist_path urlpath_regex ^/myadmin/
 acl blacklist_path urlpath_regex ^/cgi-bin/
 acl blacklist_path urlpath_regex ^/MyAdmin/
 acl blacklist_path urlpath_regex ^/myadmin/


@@ -62,6 +72,10 @@ acl pool_unlimited src <%= address %>
 acl tile_caches src <%= address %>
 <% end -%>
 <% end -%>
 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

 
 #Allow tile_caches ICP access
 icp_access allow tile_caches
 
 #Allow tile_caches ICP access
 icp_access allow tile_caches