Run pluto through bundler

[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 f250bb972c6e260293b43245938f55e240139989..6b5d2c48edbca90d9553e8126714483367261626 100644 (file)
--- a/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
+++ b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
@@ -1,9 +1,9 @@
 # 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;
+    server 127.0.0.1;

 
 

-    keepalive 32;
+    keepalive 256;

 }
 
 # Rates table based on current cookie value
 }
 
 # Rates table based on current cookie value


@@ -53,6 +53,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.


@@ -88,20 +90,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 _;
-    add_header Access-Control-Allow-Origin *;
-    return 301 https://$host$request_uri;
-}
-
-server {
-    listen 80;
-    listen [::]:80;
-    server_name ~^(?<subdomain>(?:[a-d]\.)?tile)\.osm\.org$;
-    add_header Access-Control-Allow-Origin *;
-    return 301 https://$subdomain.openstreetmap.org$request_uri;
-}