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

Merge pull request #101 from EvaSDK/master

Browse Source 
Workaround for include being defined too early
This commit is contained in:
Forrest 2015-11-12 16:58:56 -08:00
commit 3320a5f8bc
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nginx/ng/files/nginx.conf
View File

@ -7,8 +7,13 @@
{%- elif value is mapping -%} {%- elif value is mapping -%}
{{ key|indent(ind, True) }}{{ operator }}{{ '{' }} {{ key|indent(ind, True) }}{{ operator }}{{ '{' }}
{%- for k, v in value.items() %} {%- for k, v in value.items() %}
{%- if k != 'include' %}
{{ nginx_block(v, k, operator, delim, (ind + indent_increment)) }} {{ nginx_block(v, k, operator, delim, (ind + indent_increment)) }}
{%- endif %}
{%- endfor %} {%- endfor %}
{%- if 'include' in value.keys() %}
{{ nginx_block(value['include'], 'include', operator, delim, (ind + indent_increment)) }}
{%- endif %}
{{ '}'|indent(ind, True) }} {{ '}'|indent(ind, True) }}
{%- elif value is iterable -%} {%- elif value is iterable -%}
{%- for v in value %} {%- for v in value %}