tilecache: Disable rate limiting tiles

[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 eb7cb6771bd45f9d4d2ab285c9101f1381b0e5da..ccc7a8316ea1cc8123f6b240baceb194bd26f828 100644 (file)
--- a/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
+++ b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
@@ -1,18 +1,15 @@
 # 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;
-  server 127.0.0.2;
-  server 127.0.0.3;
+  server 127.0.0.1:8080;
+  server 127.0.0.2:8080;

 
   # Add the other caches to relieve pressure if local squid failing
   # Balancer: round-robin
 <% @caches.each do |cache| -%>
 <% if cache[:hostname] != node[:hostname] -%>
 
   # 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| -%>
 <% cache.ipaddresses(:family => :inet, :role => :external).sort.each do |address| -%>

-  server <%= address %> backup; # Server <%= cache[:hostname] %>
-<% end -%>
+  server <%= address %>:80 backup; # Server <%= cache[:hostname] %>

 <% end -%>
 <% end -%>
 <% end -%>
 <% end -%>
 <% end -%>
 <% end -%>


@@ -32,14 +29,14 @@ geo $tile_cache {
 }
 
 # Rates table based on current cookie value
 }
 
 # Rates table based on current cookie value

-map $cookie__osm_totp_token $limit_rate_qos {
-  include /etc/nginx/conf.d/tile_qos_rates.map;
-}
+# map $cookie__osm_totp_token $limit_rate_qos {
+#  include /etc/nginx/conf.d/tile_qos_rates.map;
+# }

 
 # Set-Cookie table based on current cookie value
 
 # Set-Cookie table based on current cookie value

-map $cookie__osm_totp_token $cookie_qos_token_set {
-  include /etc/nginx/conf.d/tile_qos_cookies.map;
-}
+# map $cookie__osm_totp_token $cookie_qos_token_set {
+#  include /etc/nginx/conf.d/tile_qos_cookies.map;
+# }

 
 map $http_user_agent $approved_scraper {
   default                   0; # Not approved
 
 map $http_user_agent $approved_scraper {
   default                   0; # Not approved


@@ -93,10 +90,16 @@ map $osm_referer$http_user_agent $limit_http_pragma {
 }
 
 server {
 }
 
 server {

+    # IPv4
+    listen       80 deferred backlog=16384 reuseport fastopen=2048 default_server;

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

+    # IPv6
+    listen       [::]:80 deferred backlog=16384 reuseport fastopen=2048 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;

+    proxy_busy_buffers_size 64k;

 
     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;


@@ -224,16 +227,18 @@ server {
       proxy_cache_valid 200 1d;
       proxy_cache_valid 404 15m;
       # Serve stale cache on errors or if updating
       proxy_cache_valid 200 1d;
       proxy_cache_valid 404 15m;
       # Serve stale cache on errors or if updating

-      proxy_cache_use_stale error timeout updating http_500 http_503 http_504;
+      proxy_cache_use_stale error timeout updating http_404 http_500 http_503 http_504;

       # If in cache as stale, serve stale and update in background
       proxy_cache_background_update on;
       # If in cache as stale, serve stale and update in background
       proxy_cache_background_update on;

+      # Enable revalidation using If-Modified-Since and If-None-Match for stale items
+      proxy_cache_revalidate on;

       proxy_cache_min_uses 8;
 
       proxy_cache_min_uses 8;
 

-      add_header X-Nginx-Cache-Status $upstream_cache_status;
+      add_header x-cache-status $upstream_cache_status;

 <% end -%>
 
       # Set a QoS cookie if none presented (uses nginx Map)
 <% end -%>
 
       # Set a QoS cookie if none presented (uses nginx Map)

-      add_header Set-Cookie $cookie_qos_token_set;
+      # add_header Set-Cookie $cookie_qos_token_set;

 <% if node[:ssl][:strict_transport_security] -%>
       # Ensure Strict-Transport-Security header is removed from proxied server responses
       proxy_hide_header Strict-Transport-Security;
 <% if node[:ssl][:strict_transport_security] -%>
       # Ensure Strict-Transport-Security header is removed from proxied server responses
       proxy_hide_header Strict-Transport-Security;


@@ -243,12 +248,12 @@ server {
 <% end -%>
 
       # QoS Traffic Rate see $limit_rate on http://nginx.org/en/docs/http/ngx_http_core_module.html
 <% end -%>
 
       # QoS Traffic Rate see $limit_rate on http://nginx.org/en/docs/http/ngx_http_core_module.html

-      set $limit_rate $limit_rate_qos;
+      # set $limit_rate $limit_rate_qos;

 
       # Allow Higher Traffic Rate from Approved User-Agents which do not support cookies (uses nginx Map)
 
       # Allow Higher Traffic Rate from Approved User-Agents which do not support cookies (uses nginx Map)

-      if ($approved_scraper) {
-        set $limit_rate 65536;
-      }
+      # if ($approved_scraper) {
+      #   set $limit_rate 65536;
+      # }

 
       if ($denied_scraper) {
         set $limit_rate 512;
 
       if ($denied_scraper) {
         set $limit_rate 512;