From 03f73add168d192ce0d1347e620bb0eb57f203f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89tienne=20BERSAC?= Date: Fri, 13 Mar 2015 16:03:02 +0100 Subject: [PATCH] Fix nginx config on systemd --- nginx/templates/config.jinja | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nginx/templates/config.jinja b/nginx/templates/config.jinja index 6be0b69..4c36c3d 100644 --- a/nginx/templates/config.jinja +++ b/nginx/templates/config.jinja @@ -13,7 +13,9 @@ worker_rlimit_nofile {{ worker_rlimit_nofile }}; {% set error_log_level = nginx.get('error_log',{}).get('level', 'warn') -%} error_log {{ ' '.join([error_log_location, error_log_level]) }}; pid {{ nginx.get('pid', '/var/run/nginx.pid') }}; +{% if salt['test.provider']('service') != 'systemd' -%} daemon {{ nginx.get('daemon', 'on') }}; +{%- endif %} events { worker_connections {{ nginx.get('events', {}).get('worker_connections', 1024) }};