From b751ec5761a9bbe60c4ba7b0665e3b9af89bfce6 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Tue, 16 Dec 2014 15:49:50 +0000 Subject: [PATCH] Support nginx on 14.04 + dynamic number of worker processes based on CPUs --- cookbooks/nginx/templates/default/nginx.conf.erb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cookbooks/nginx/templates/default/nginx.conf.erb b/cookbooks/nginx/templates/default/nginx.conf.erb index 6133b2404..c16aa9650 100644 --- a/cookbooks/nginx/templates/default/nginx.conf.erb +++ b/cookbooks/nginx/templates/default/nginx.conf.erb @@ -1,7 +1,11 @@ # DO NOT EDIT - This file is being maintained by Chef -user nginx; -worker_processes 4; +<% if node[:lsb][:release].to_f >= 14.04 -%> + user www-data; +<% else -%> + user nginx; +<% end -%> +worker_processes <%= node['cpu']['total'] %>; error_log /var/log/nginx/error.log warn; pid /var/run/nginx.pid; -- 2.43.2