Merge remote-tracking branch 'github/pull/56'

[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 8e2df0a24951673419dc2339b36244279448eb73..2127404f21c6d8d13f321b4d367959e195045bdf 100644 (file)
--- a/cookbooks/tilecache/templates/default/squid.conf.erb
+++ b/cookbooks/tilecache/templates/default/squid.conf.erb
@@ -1,15 +1,70 @@
 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 osmtiles_png urlpath_regex .png$
 
 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 osmtiles_png urlpath_regex .png$
 

-http_access allow osmtile_sites
+acl osmtileScrapers browser ^$
+acl osmtileScrapers browser ^MOBAC
+acl osmtileScrapers browser ^JTileDownloader
+acl osmtileScrapers browser ^Apache\-HttpClient
+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 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$
+acl osmtileScrapers browser ^app_name$
+
+http_access deny osmtile_sites osmtileScrapers
+
+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 ^/pma/
+acl blacklist_path urlpath_regex ^/phpmyadmin/
+acl blacklist_path urlpath_regex ^/phpMyAdmin/
+acl blacklist_path urlpath_regex ^/idssvc/
+acl blacklist_path urlpath_regex ^/iesvc/
+acl blacklist_path urlpath_regex ^/invoker/
+acl blacklist_path urlpath_regex ^/jmx-console/
+acl blacklist_path urlpath_regex ^/manager/
+acl blacklist_path urlpath_regex ^/service/
+acl blacklist_path urlpath_regex ^/web-console/
+acl blacklist_path urlpath_regex ^/wstats/
+acl blacklist_path urlpath_regex ^/zecmd/
+
+http_access allow osmtile_sites whitelist_path
+http_access deny blacklist_path
+
+acl requestMethodGet method GET
+
+http_access allow osmtile_sites requestMethodGet

 
 acl osmtile_nocache_url urlpath_regex \.png/(status|dirty)$
 cache deny osmtile_sites osmtile_nocache_url
 
 
 acl osmtile_nocache_url urlpath_regex \.png/(status|dirty)$
 cache deny osmtile_sites osmtile_nocache_url
 

-cache_peer <%= node[:tilecache][:tile_parent] %> parent 80 0 no-query originserver name=osmtileAccel login=PASS connect-timeout=90 no-digest
-
+<% 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

 cache_peer_access osmtileAccel allow osmtile_sites
 cache_peer_access osmtileAccel allow osmtile_sites

-cache_peer_access osmtileAccel deny all
+
+#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
 
 #----------------------------------
 #Create an unlimited pool for cache IP addresses


@@ -17,8 +72,24 @@ 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 %>
 <% @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 -%>
 <% 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
+
+#Allow tile_caches ICP access
+icp_access allow tile_caches

 
 acl pool_000 src 0.0.0.0/7
 acl pool_002 src 2.0.0.0/7
 
 acl pool_000 src 0.0.0.0/7
 acl pool_002 src 2.0.0.0/7