Skip to content

Commit

Permalink
Workaround for include being defined too early
Browse files Browse the repository at this point in the history
This is crap but configuration for http scope cannot be both ordered and
merged from map.jinja it seems, see issue saltstack-formulas#40.
  • Loading branch information
EvaSDK committed Nov 12, 2015
1 parent 7647f3c commit 294a775
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions nginx/ng/files/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down

0 comments on commit 294a775

Please sign in to comment.