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 398cefff9821b3ef47f7109459d8faf210a9dde6..13597d9fae79c2442613dfce7aabcaa99723942e 100644 (file)
--- 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'] %>;
 
 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;
 
 error_log  /var/log/nginx/error.log warn;
 pid        /var/run/nginx.pid;


@@ -11,23 +12,21 @@ events {
     worker_connections  1024;
 }
 
     worker_connections  1024;
 }
 

-

 http {
     include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
 
 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"';
 
     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;
 
 
     keepalive_timeout  65;
 

-    #gzip  on;
+    server_tokens off;

 
     include /etc/nginx/conf.d/*.conf;
 }
 
     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 63e915fffd284742ff2532f6b343df6febb808df..7f01c3fc8116ed5ee97cfa912ca0611f80b75eeb 100644 (file)
--- 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 {
 }
 
 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;


@@ -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_pass http://tile_cache_backend;
       proxy_set_header X-Forwarded-For $remote_addr;
       proxy_http_version 1.1;

+      proxy_set_header Connection "";

     }
 }
     }
 }