tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nginx: Manually merge nginx from parameterize

Browse source
This commit is contained in:
Ossi Salmi 2015-03-18 13:10:37 +02:00
parent 4b498aa860
commit efa029b0ba
3 changed files with 73 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nginx/templates/nginx.conf.erb
View file

@ -1,5 +1,6 @@
user <%= @user %>;
worker_processes <%= @processorcount %>;
worker_processes <%= @workers %>;
worker_rlimit_nofile 1024;
events {
worker_connections 1024;
@ -9,10 +10,7 @@ http {
include mime.types;
default_type application/octet-stream;
sendfile on;
tcp_nodelay on;
tcp_nopush on;
keepalive_timeout 65;
server_tokens off;
include conf.d/*.conf;
}