X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/c4abdded449ba9f2905f78fb9d2c017a49f99b17..b751ec5761a9bbe60c4ba7b0665e3b9af89bfce6:/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 8db8b0ffd..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 1; +<% 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;