Merge pull request #61 from rfairburn/master

nginx config default should use the error.fifo
This commit is contained in:
Nitin Madhok 2014-10-21 14:53:51 -07:00
commit 4f64967da3

View File

@ -9,7 +9,7 @@ worker_processes {{ nginx.get('worker_processes', 1) }};
worker_rlimit_nofile {{ worker_rlimit_nofile }}; worker_rlimit_nofile {{ worker_rlimit_nofile }};
{% endif -%} {% endif -%}
{% set error_log_location = nginx.get('error_log',{}).get('location', '/var/log/nginx/error.log') -%} {% set error_log_location = nginx.get('error_log',{}).get('location', '/var/log/nginx/error.fifo') -%}
{% set error_log_level = nginx.get('error_log',{}).get('level', 'warn') -%} {% set error_log_level = nginx.get('error_log',{}).get('level', 'warn') -%}
error_log {{ ' '.join([error_log_location, error_log_level]) }}; error_log {{ ' '.join([error_log_location, error_log_level]) }};
pid {{ nginx.get('pid', '/var/run/nginx.pid') }}; pid {{ nginx.get('pid', '/var/run/nginx.pid') }};