Merge branch 'block-fastpokemap'

[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 71daa6cefda98fc84962bb0396be7ad2c614c7ea..a5aea7912fd0f3762f9a4f11bfc0024013103cba 100644 (file)
--- a/cookbooks/tilecache/templates/default/squid.conf.erb
+++ b/cookbooks/tilecache/templates/default/squid.conf.erb
@@ -22,9 +22,25 @@ 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$
+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
 
 http_access deny osmtile_sites osmtileScrapers
 
+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/
+
+http_access deny osmtile_sites osmtileOverusers
+
+# Block when neither the referer nor User-Agent is set - policy requires some identification of the site / app.
+acl has_referer referer_regex .
+acl has_user_agent browser_regex .
+
+http_access deny osmtile_sites !has_referer !has_user_agent
+
 acl whitelist_path urlpath_regex ^/cgi-bin/(export|debug)
 acl blacklist_path urlpath_regex ^/cgi-bin/
 acl blacklist_path urlpath_regex ^/MyAdmin/
@@ -45,7 +61,9 @@ acl blacklist_path urlpath_regex ^/zecmd/
 http_access allow osmtile_sites whitelist_path
 http_access deny blacklist_path
 
-http_access allow osmtile_sites
+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
@@ -54,7 +72,7 @@ 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=60 no-digest weight=1000
+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
@@ -82,6 +100,8 @@ 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