tilecache: reject request without user-agent

[chef.git] / cookbooks / nginx / templates / default / nginx.conf.erb

diff --git a/cookbooks/nginx/templates/default/nginx.conf.erb b/cookbooks/nginx/templates/default/nginx.conf.erb
index 7bf95a7fbe351b04bce8833373dc10e3a02e2662..68fae2f0a0a5317fd35d274be1ec194950b3b4a2 100644 (file)
--- a/cookbooks/nginx/templates/default/nginx.conf.erb
+++ b/cookbooks/nginx/templates/default/nginx.conf.erb
@@ -3,14 +3,14 @@
 user  www-data;
 worker_processes auto;
 worker_cpu_affinity auto;
 user  www-data;
 worker_processes auto;
 worker_cpu_affinity auto;

-worker_rlimit_nofile 65536;
+worker_rlimit_nofile 98304;

 
 error_log  /var/log/nginx/error.log warn;
 pid        /var/run/nginx.pid;
 
 
 events {
 
 error_log  /var/log/nginx/error.log warn;
 pid        /var/run/nginx.pid;
 
 
 events {

-    worker_connections  1024;
+    worker_connections  8192;

 }
 
 http {
 }
 
 http {


@@ -18,6 +18,7 @@ http {
     default_type  application/octet-stream;
 
     server_names_hash_bucket_size 128;
     default_type  application/octet-stream;
 
     server_names_hash_bucket_size 128;

+    map_hash_bucket_size 128;

 
 <% if node[:nginx][:access_log] -%>
     log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
 
 <% if node[:nginx][:access_log] -%>
     log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '


@@ -25,14 +26,16 @@ http {
                       '"$http_user_agent" "$http_x_forwarded_for"';
 
     access_log  <%= node[:nginx][:access_log] %>  main  buffer=32k flush=1m;
                       '"$http_user_agent" "$http_x_forwarded_for"';
 
     access_log  <%= node[:nginx][:access_log] %>  main  buffer=32k flush=1m;

+<% else -%>
+    access_log  off;

 <% end -%>
 
 <% end -%>
 

-    keepalive_timeout  65;
+    keepalive_timeout  30;

 
     server_tokens off;
 
     ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
 
     server_tokens off;
 
     ssl_protocols TLSv1 TLSv1.1 TLSv1.2;

-    ssl_ciphers <%= node[:ssl][:ciphers] -%>;
+    ssl_ciphers <%= node[:ssl][:openssl_ciphers] -%>;

     ssl_prefer_server_ciphers on;
     ssl_session_cache shared:SSL:50m;
     ssl_session_timeout 30m;
     ssl_prefer_server_ciphers on;
     ssl_session_cache shared:SSL:50m;
     ssl_session_timeout 30m;


@@ -41,6 +44,12 @@ http {
     resolver <%= @resolvers.join(" ") %>;
     resolver_timeout 5s;
 
     resolver <%= @resolvers.join(" ") %>;
     resolver_timeout 5s;
 

+    ssl_session_tickets on;
+    ssl_session_timeout 1h;
+    ssl_session_ticket_key /var/run/nginx-ephemeral/nginx_session_ticket_curr;
+    ssl_session_ticket_key /var/run/nginx-ephemeral/nginx_session_ticket_prev;
+    ssl_session_ticket_key /var/run/nginx-ephemeral/nginx_session_ticket_next;
+

     <% if node['nginx']['cache']['fastcgi']['enable'] -%>
     fastcgi_cache_path /var/cache/nginx/fastcgi-cache levels=1:2 keys_zone=<%= node['nginx']['cache']['fastcgi']['keys_zone'] %> inactive=<%= node['nginx']['cache']['fastcgi']['inactive'] %> max_size=<%= node['nginx']['cache']['fastcgi']['max_size'] %>;
     <% end -%>
     <% if node['nginx']['cache']['fastcgi']['enable'] -%>
     fastcgi_cache_path /var/cache/nginx/fastcgi-cache levels=1:2 keys_zone=<%= node['nginx']['cache']['fastcgi']['keys_zone'] %> inactive=<%= node['nginx']['cache']['fastcgi']['inactive'] %> max_size=<%= node['nginx']['cache']['fastcgi']['max_size'] %>;
     <% end -%>