Fix nginx proxy cache path variable

[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 c16aa965020cb002c50eb4f8c32302e5b4e66a12..903afd51c9781f2bf4ff7355df657a317be030e4 100644 (file)
--- a/cookbooks/nginx/templates/default/nginx.conf.erb
+++ b/cookbooks/nginx/templates/default/nginx.conf.erb
@@ -1,11 +1,8 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 # DO NOT EDIT - This file is being maintained by Chef
 

-<% if node[:lsb][:release].to_f >= 14.04 -%>
-  user  www-data;
-<% else -%>
-  user  nginx;
-<% end -%>
+user  www-data;

 worker_processes <%= node['cpu']['total'] %>;
 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;


@@ -15,23 +12,28 @@ 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;
+
+    <% 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;
 }
 
     include /etc/nginx/conf.d/*.conf;
 }