From c28cac34839819b467779737e22cb37282bfd322 Mon Sep 17 00:00:00 2001 From: Ahmad Sherif Date: Fri, 30 May 2014 19:28:59 +0300 Subject: [PATCH] Group source.sls include declarations into one --- nginx/source.sls | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/nginx/source.sls b/nginx/source.sls index bacba90..17b030a 100644 --- a/nginx/source.sls +++ b/nginx/source.sls @@ -1,6 +1,3 @@ -include: - - nginx.common - {% set nginx = pillar.get('nginx', {}) -%} {% set version = nginx.get('version', '1.5.2') -%} {% set checksum = nginx.get('checksum', 'sha1=3546be28a72251f8823ab6be6a1180d300d06f76') -%} @@ -11,13 +8,12 @@ include: {% set nginx_home = home + "/nginx-" + version -%} {% set nginx_modules_dir = source + "/nginx-modules" -%} -{% if nginx['with_luajit'] -%} include: + - nginx.common +{% if nginx['with_luajit'] %} - nginx.luajit2 {% endif -%} - -{% if nginx['with_openresty'] -%} -include: +{% if nginx['with_openresty'] %} - nginx.openresty {% endif -%}