Merge branch 'block-fastpokemap'

diff --combined cookbooks/tilecache/templates/default/squid.conf.erb
index 5ec58b25b6d88b446f3c466a2d1db9fec3c59e1a,032a60ecdb532de77198d12cbc7ee188d11e6623..a5aea7912fd0f3762f9a4f11bfc0024013103cba
--- 1/cookbooks/tilecache/templates/default/squid.conf.erb
--- 2/cookbooks/tilecache/templates/default/squid.conf.erb
+++ b/cookbooks/tilecache/templates/default/squid.conf.erb
@@@ -23,22 -23,16 +23,24 @@@ acl osmtileScrapers browser MSIE.7\.0.*
  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/