tilecache: cleanup blocks

diff --git a/cookbooks/tilecache/templates/default/nginx_tile.conf.erb b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
index 62e25d195b3a93ce708d65643833396087c339dc..4c99dfb0eb7f85246d73cdfe77e9359386277ed1 100644 (file)
--- a/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
+++ b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
@@ -1,20 +1,29 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 upstream tile_cache_backend {
-    server 127.0.0.1;
+  server 127.0.0.1;
 
-    # Add the other caches to relieve pressure if local squid failing
-    # Balancer: round-robin
+  # Add the other caches to relieve pressure if local squid failing
+  # Balancer: round-robin
 <% @caches.each do |cache| -%>
 <% if cache[:hostname] != node[:hostname] -%>
-    # Server <%= cache[:hostname] %>
 <% cache.ipaddresses(:family => :inet, :role => :external).sort.each do |address| -%>
-    server <%= address %> backup;
+  server <%= address %> backup; # Server <%= cache[:hostname] %>
 <% end -%>
 <% end -%>
 <% end -%>
 
-    keepalive 256;
+  keepalive 256;
+}
+
+# Geo Map of tile caches
+geo $tile_cache {
+  default 0;
+<% @caches.each do |cache| -%>
+<% cache.ipaddresses(:family => :inet, :role => :external).sort.each do |address| -%>
+  <%= address %> 1; # <%= cache[:hostname] %>
+<% end -%>
+<% end -%>
 }
 
 # Rates table based on current cookie value
@@ -28,30 +37,34 @@ map $cookie_qos_token $cookie_qos_token_set {
 }
 
 map $http_user_agent $approved_scraper {
-  default '';                       # Not approved
-  '~^JOSM\/' 'JOSM';
-  '~^Mozilla\/5\.0\ QGIS\/' 'QGIS';
+  default                   0; # Not approved
+  '~^JOSM\/'                1; # JOSM
+  '~^Mozilla\/5\.0\ QGIS\/' 1; # QGIS
 }
 
 map $http_user_agent $denied_scraper {
-  default '';          # Not denied
-  '~^Python\-urllib\/' 'Python';
-  '~^python\-requests\/' 'Python';
-  '~^R$'               'R';
-  '~^Java\/'           'Java';
-  '~^tiles$'           'Unknown';
-  '~^Dalvik\/'         'Dalvik';
-  '~^runtastic'        'runtastic';
-  'Mozilla/4.0'        'Unknown';
-  'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)' 'Unknown';
+  default                0; # Not denied
+  '~^Python\-urllib\/'   1; # Library Default
+  '~^python\-requests\/' 1; # Library Default
+  '~^R$'                 1; # Library Default
+  '~^Java\/'             1; # Library Default
+  '~^tiles$'             1; # Library Default
+  '~^Dalvik\/'           1; # Library Default
+  '~^runtastic'          1; # App
+  'Mozilla/4.0'          1; # Fake
+  'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)' 1;  # Fake
 }
 
 map $http_referer $denied_referer {
-  default '';                      # Not denied
-  'http://www.openstreetmap.org/'  'old-osm';
-  'http://www.osm.org/'            'old-osm';
-  'http://openstreetmap.org'       'fake-osm';
-  'http://www.openstreetmap.org'   'fake-osm';
+  default                          0; # Not denied
+  'http://www.openstreetmap.org/'  1; # Faked
+  'http://www.openstreetmap.org'   1; # Faked
+  'http://openstreetmap.org/'      1; # Faked
+  'http://openstreetmap.org'       1; # Faked
+  'http://www.osm.org/'            1; # Faked
+  'http://www.osm.org'             1; # Faked
+  'http://osm.org/'                1; # Faked
+  'http://osm.org'                 1; # Faked
 }
 
 # Limit Cache-Control header to only approved User-Agents
@@ -115,9 +128,11 @@ server {
       }
 
       if ($denied_scraper) {
+        set $limit_rate 512;
         return 429;
       }
       if ($denied_referer) {
+        set $limit_rate 512;
         return 418;
       }