saltstack-formulas/nginx-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix nginx config on systemd

Browse Source
This commit is contained in:
Étienne BERSAC 2015-03-13 16:03:02 +01:00
parent 3cdf007cec
commit 03f73add16
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nginx/templates/config.jinja
View File

@ -13,7 +13,9 @@ worker_rlimit_nofile {{ worker_rlimit_nofile }};
{% 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') }};
{% if salt['test.provider']('service') != 'systemd' -%}
daemon {{ nginx.get('daemon', 'on') }}; daemon {{ nginx.get('daemon', 'on') }};
{%- endif %}
events { events {
worker_connections {{ nginx.get('events', {}).get('worker_connections', 1024) }}; worker_connections {{ nginx.get('events', {}).get('worker_connections', 1024) }};