Merge remote-tracking branch 'github/pull/56'

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

diff --git a/cookbooks/tilecache/templates/default/nginx_tile_ssl.conf.erb b/cookbooks/tilecache/templates/default/nginx_tile_ssl.conf.erb
index 0b587e242bb173357c6c01fbd0e513054a7fabee..7f01c3fc8116ed5ee97cfa912ca0611f80b75eeb 100644 (file)
--- a/cookbooks/tilecache/templates/default/nginx_tile_ssl.conf.erb
+++ b/cookbooks/tilecache/templates/default/nginx_tile_ssl.conf.erb
@@ -1,17 +1,19 @@
 upstream tile_cache_backend {
     server 127.0.0.1;
     <% @caches.each do |cache| -%>
 upstream tile_cache_backend {
     server 127.0.0.1;
     <% @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 -%>
     #Server <%= cache[:hostname] %>
     <% cache.ipaddresses(:family => :inet, :role => :external).sort.each do |address| -%>
     server <%= address %> backup;
     <% end -%>
     <% end -%>

+    <% end -%>

 
     keepalive 32;
 }
 
 server {
 
     keepalive 32;
 }
 
 server {

-    listen       443 ssl spdy default_server;
+    listen       443 ssl default_server;

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


@@ -32,5 +34,6 @@ server {
       proxy_pass http://tile_cache_backend;
       proxy_set_header X-Forwarded-For $remote_addr;
       proxy_http_version 1.1;
       proxy_pass http://tile_cache_backend;
       proxy_set_header X-Forwarded-For $remote_addr;
       proxy_http_version 1.1;

+      proxy_set_header Connection "";

     }
 }
     }
 }