From: Grant Slater <git@firefishy.com>
Date: Wed, 30 Dec 2015 09:49:44 +0000 (+0000)
Subject: Nginx: drop spdy + log/keepalive tweaks + cleanups
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/c1a9f6c354f1feb34433134850ecdd4fffe5ba1d?ds=sidebyside

Nginx: drop spdy + log/keepalive tweaks + cleanups
---

diff --git a/cookbooks/nginx/templates/default/nginx.conf.erb b/cookbooks/nginx/templates/default/nginx.conf.erb
index 398cefff9..13597d9fa 100644
--- a/cookbooks/nginx/templates/default/nginx.conf.erb
+++ b/cookbooks/nginx/templates/default/nginx.conf.erb
@@ -2,6 +2,7 @@
 
 user  www-data;
 worker_processes <%= node['cpu']['total'] %>;
+worker_rlimit_nofile 65536;
 
 error_log  /var/log/nginx/error.log warn;
 pid        /var/run/nginx.pid;
@@ -11,23 +12,21 @@ events {
     worker_connections  1024;
 }
 
-
 http {
     include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
 
+    server_names_hash_bucket_size 128;
+
     log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
                       '$status $body_bytes_sent "$http_referer" '
                       '"$http_user_agent" "$http_x_forwarded_for"';
 
-    access_log  /var/log/nginx/access.log  main;
-
-    sendfile        on;
-    #tcp_nopush     on;
+    access_log  /var/log/nginx/access.log  main  buffer=32k flush=1m;
 
     keepalive_timeout  65;
 
-    #gzip  on;
+    server_tokens off;
 
     include /etc/nginx/conf.d/*.conf;
 }
diff --git a/cookbooks/tilecache/templates/default/nginx_tile_ssl.conf.erb b/cookbooks/tilecache/templates/default/nginx_tile_ssl.conf.erb
index 63e915fff..7f01c3fc8 100644
--- a/cookbooks/tilecache/templates/default/nginx_tile_ssl.conf.erb
+++ b/cookbooks/tilecache/templates/default/nginx_tile_ssl.conf.erb
@@ -13,7 +13,7 @@ upstream tile_cache_backend {
 }
 
 server {
-    listen       443 ssl spdy default_server;
+    listen       443 ssl default_server;
     server_name  localhost;
 
     proxy_buffers 8 64k;
@@ -34,5 +34,6 @@ server {
       proxy_pass http://tile_cache_backend;
       proxy_set_header X-Forwarded-For $remote_addr;
       proxy_http_version 1.1;
+      proxy_set_header Connection "";
     }
 }