Browse Source

Merge pull request #79 from bersace/systemd

Fix nginx config on systemd
tags/v0.55.0
Nitin Madhok 9 years ago
parent
commit
013a0e8406
1 changed files with 2 additions and 0 deletions
  1. +2
    -0
      nginx/templates/config.jinja

+ 2
- 0
nginx/templates/config.jinja View File

{% 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) }};

Loading…
Cancel
Save