tilecache: remove cache poisoning headers

[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 98d2839324ae6b024fe7cbe2b754fb4ebc7b6cf5..f53cb4ec440e9762d0a37bcd7e62f08a16e708f8 100644 (file)
--- a/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
+++ b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
@@ -2,6 +2,8 @@
 
 upstream tile_cache_backend {
   server 127.0.0.1;
+  server 127.0.0.2;
+  server 127.0.0.3;
 
   # Add the other caches to relieve pressure if local squid failing
   # Balancer: round-robin
@@ -15,7 +17,7 @@ upstream tile_cache_backend {
 <% end -%>
 <% end -%>
 
-  keepalive 1024;
+  keepalive 512;
   keepalive_requests 1024;
 }
 
@@ -164,7 +166,7 @@ server {
       return 404;
     }
 
-<% for i in 0..13 do %>
+<% for i in 0..14 do %>
 <% if i == 0 -%>
     # Default Fallback Location Handler (lowest)
     location / {
@@ -177,14 +179,28 @@ server {
       proxy_http_version 1.1;
       proxy_set_header Connection '';
 
-      proxy_connect_timeout 5s;
+      proxy_connect_timeout 10s;
 
-      # Preserve host header.
-      proxy_set_header Host $host;
+      # Replace host header.
+      proxy_set_header Host 'tile.openstreetmap.org';
       # Do not pass cookies to backends.
       proxy_set_header Cookie '';
       # Do not pass Accept-Encoding to backends.
       proxy_set_header Accept-Encoding '';
+      # Do not pass Accept to backends.
+      proxy_set_header Accept '';
+      # Do not pass Accept-Language to backends as unused.
+      proxy_set_header Accept-Language '';
+      proxy_set_header Accept-Charset '';
+      # Do not send origin, we allow all.
+      proxy_set_header origin '';
+      # Do not pass invalid header to backend.
+      proxy_set_header X-Forwarded-Host '';
+      proxy_set_header X-Host '';
+      proxy_set_header Authorization '';
+
+      # Drop partial requests
+      proxy_set_header range '';
 
       # Do not allow setting cookies from backends due to caching.
       proxy_ignore_headers Set-Cookie;
@@ -201,6 +217,8 @@ server {
       # If in cache as stale, serve stale and update in background
       proxy_cache_background_update on;
       proxy_cache_min_uses 8;
+
+      add_header X-Nginx-Cache-Status $upstream_cache_status;
 <% end -%>
 
       # Set a QoS cookie if none presented (uses nginx Map)