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

Workaround for include being defined too early

Browse Source 
This is crap but configuration for http scope cannot be both ordered and
merged from map.jinja it seems, see issue #40.
This commit is contained in:
Gilles Dartiguelongue 2015-08-15 13:31:11 +02:00
parent 7647f3cec2
commit 294a775b98
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 -%}
{{ key|indent(ind, True) }}{{ operator }}{{ '{' }}
{%- for k, v in value.items() %}
{%- if k != 'include' %}
{{ nginx_block(v, k, operator, delim, (ind + indent_increment)) }}
{%- endif %}
{%- endfor %}
{%- if 'include' in value.keys() %}
{{ nginx_block(value['include'], 'include', operator, delim, (ind + indent_increment)) }}
{%- endif %}
{{ '}'|indent(ind, True) }}
{%- elif value is iterable -%}
{%- for v in value %}