Add support for squid 4

[chef.git] / cookbooks / tilecache / templates / default / nginx_tile.conf.erb

diff --git a/cookbooks/tilecache/templates/default/nginx_tile.conf.erb b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
index ce2b23b9ae26bb9998e68342d7acebf15b2c46a6..036a3506f063ae7ae73e15685175ae64ca43ae02 100644 (file)
--- a/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
+++ b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
@@ -1,17 +1,31 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 upstream tile_cache_backend {
 # DO NOT EDIT - This file is being maintained by Chef
 
 upstream tile_cache_backend {

-    server 127.0.0.1:8080;
-    <% @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;
-    <% end -%>
-    <% end -%>
-    <% end -%>
-
-    keepalive 32;
+  server 127.0.0.1;
+
+  # Add the other caches to relieve pressure if local squid failing
+  # Balancer: round-robin
+<% @caches.each do |cache| -%>
+<% if cache[:hostname] != node[:hostname] -%>
+<% if node[:tilecache][:tile_siblings].include? cache[:fqdn] -%>
+<% cache.ipaddresses(:family => :inet, :role => :external).sort.each do |address| -%>
+  server <%= address %> backup; # Server <%= cache[:hostname] %>
+<% end -%>
+<% end -%>
+<% end -%>
+<% end -%>
+
+  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
 }
 
 # Rates table based on current cookie value


@@ -25,9 +39,35 @@ map $cookie_qos_token $cookie_qos_token_set {
 }
 
 map $http_user_agent $approved_scraper {
 }
 
 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                0; # Not denied
+  ''                     1; # No User-Agent Set
+  '~^Python\-urllib\/'   1; # Library Default
+  '~^python\-requests\/' 1; # Library Default
+  '~^node\-fetch\/'      1; # Library Default
+  '~^R$'                 1; # Library Default
+  '~^Java\/'             1; # Library Default
+  '~^tiles$'             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                          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
 }
 
 # Limit Cache-Control header to only approved User-Agents


@@ -45,7 +85,7 @@ map $http_user_agent $limit_http_pragma {
 }
 
 server {
 }
 
 server {

-    listen       443 ssl fastopen=2048 http2 default_server;
+    listen       443 ssl deferred backlog=16384 reuseport fastopen=2048 http2 default_server;

     server_name  localhost;
 
     proxy_buffers 8 64k;
     server_name  localhost;
 
     proxy_buffers 8 64k;


@@ -53,6 +93,72 @@ server {
     ssl_certificate      /etc/ssl/certs/tile.openstreetmap.org.pem;
     ssl_certificate_key  /etc/ssl/private/tile.openstreetmap.org.key;
 
     ssl_certificate      /etc/ssl/certs/tile.openstreetmap.org.pem;
     ssl_certificate_key  /etc/ssl/private/tile.openstreetmap.org.key;
 

+    # Immediately 404 layers we do not support
+<% for i in 20..99 do %>
+    location /<%= i %>/ {
+      set $limit_rate 512;
+      return 404;
+    }
+<% end %>
+
+    # Immediately 404 silly tile requests
+    location = /0/0/-1.png {
+      set $limit_rate 512;
+      return 404;
+    }
+    location = /1/0/-1.png {
+      set $limit_rate 512;
+      return 404;
+    }
+    location = /1/-1/0.png {
+      set $limit_rate 512;
+      return 404;
+    }
+    location = /1/-1/1.png {
+      set $limit_rate 512;
+      return 404;
+    }
+    location = /1/-1/-1.png {
+      set $limit_rate 512;
+      return 404;
+    }
+    location = /1/-1/2.png {
+      set $limit_rate 512;
+      return 404;
+    }
+    location = /1/1/-1.png {
+      set $limit_rate 512;
+      return 404;
+    }
+    location = /1/2/-1.png {
+      set $limit_rate 512;
+      return 404;
+    }
+    location = /2/0/-1.png {
+      set $limit_rate 512;
+      return 404;
+    }
+    location = /2/-1/0.png {
+      set $limit_rate 512;
+      return 404;
+    }
+    location = /2/-1/1.png {
+      set $limit_rate 512;
+      return 404;
+    }
+    location = /2/1/-1.png {
+      set $limit_rate 512;
+      return 404;
+    }
+    location = /2/-1/2.png {
+      set $limit_rate 512;
+      return 404;
+    }
+    location = /2/-1/3.png {
+      set $limit_rate 512;
+      return 404;
+    }
+

     location / {
       proxy_pass http://tile_cache_backend;
       proxy_set_header X-Forwarded-For $remote_addr;
     location / {
       proxy_pass http://tile_cache_backend;
       proxy_set_header X-Forwarded-For $remote_addr;


@@ -61,6 +167,8 @@ server {
 
       proxy_connect_timeout 5s;
 
 
       proxy_connect_timeout 5s;
 

+      # Preserve host header.
+      proxy_set_header Host $host;

       # Do not pass cookies to backends.
       proxy_set_header Cookie '';
       # Do not pass Accept-Encoding to backends.
       # Do not pass cookies to backends.
       proxy_set_header Cookie '';
       # Do not pass Accept-Encoding to backends.


@@ -85,7 +193,16 @@ server {
 
       # Allow Higher Traffic Rate from Approved User-Agents which do not support cookies (uses nginx Map)
       if ($approved_scraper) {
 
       # Allow Higher Traffic Rate from Approved User-Agents which do not support cookies (uses nginx Map)
       if ($approved_scraper) {

-        set $limit_rate 32768;
+        set $limit_rate 65536;
+      }
+
+      if ($denied_scraper) {
+        set $limit_rate 512;
+        return 429;
+      }
+      if ($denied_referer) {
+        set $limit_rate 512;
+        return 418;

       }
 
       # Strip any ?query parameters from urls
       }
 
       # Strip any ?query parameters from urls


@@ -96,18 +213,3 @@ server {
       proxy_set_header Pragma $limit_http_pragma;
     }
 }
       proxy_set_header Pragma $limit_http_pragma;
     }
 }

-
-# Convert all http requests to https
-server {
-    listen 80 default_server;
-    listen [::]:80 default_server;
-    server_name _;
-    return 301 https://$host$request_uri;
-}
-
-server {
-    listen 80;
-    listen [::]:80;
-    server_name ~^(?<subdomain>(?:[a-d]\.)?tile)\.osm\.org$;
-    return 301 https://$subdomain.openstreetmap.org$request_uri;
-}