Revert "Take thorn-03 out of production"

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

-user  nginx;
-worker_processes  4;
+user  www-data;
+worker_processes <%= node['cpu']['total'] %>;

 
 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;