X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/c1a9f6c354f1feb34433134850ecdd4fffe5ba1d..204605749875101d3316aa94917d0a4b6c055fb3:/cookbooks/nginx/templates/default/nginx.conf.erb?ds=inline

diff --git a/cookbooks/nginx/templates/default/nginx.conf.erb b/cookbooks/nginx/templates/default/nginx.conf.erb
index 13597d9fa..67b080bf1 100644
--- a/cookbooks/nginx/templates/default/nginx.conf.erb
+++ b/cookbooks/nginx/templates/default/nginx.conf.erb
@@ -1,7 +1,8 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 user  www-data;
-worker_processes <%= node['cpu']['total'] %>;
+worker_processes auto;
+worker_cpu_affinity auto;
 worker_rlimit_nofile 65536;
 
 error_log  /var/log/nginx/error.log warn;
@@ -18,15 +19,24 @@ http {
 
     server_names_hash_bucket_size 128;
 
+<% if node[:nginx][:access_log] -%>
     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  buffer=32k flush=1m;
+    access_log  <%= node[:nginx][:access_log] %>  main  buffer=32k flush=1m;
+<% end -%>
 
     keepalive_timeout  65;
 
     server_tokens off;
 
+    <% 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']['proxy']['enable'] -%>
+    proxy_cache_path /var/cache/nginx/proxy-cache levels=1:2 keys_zone=<%= node['nginx']['cache']['proxy']['keys_zone'] %> inactive=<%= node['nginx']['cache']['proxy']['inactive'] %> max_size=<%= node['nginx']['cache']['proxy']['max_size'] %>;
+    <% end -%>
+
     include /etc/nginx/conf.d/*.conf;
 }