Clean up.

This commit is contained in:
Jeff Baskin 2016-10-24 05:34:39 -04:00
parent 0541f8b4ce
commit 3f4ab0c27a

View File

@ -15,32 +15,32 @@
'virtual_server_group', 'virtual_server', 'real_server'] -%} 'virtual_server_group', 'virtual_server', 'real_server'] -%}
{%- macro config_entries(data, indents, carryover='') -%} {%- macro config_entries(data, indents, carryover='') -%}
{%- if data is string or data is number -%} {%- if data is string or data is number -%}
{{ data|string|indent(indents, True) }}{{ '\n' }} {{- data|string|indent(indents, True) }}{{ '\n' -}}
{%- elif data is none -%} {%- elif data is none -%}
{{ '\n' -}} {{- '\n' -}}
{%- else -%} {%- else -%}
{%- if indents != 0 and not carryover -%} {%- if indents != 0 and not carryover -%}
{{- " {\n" -}} {{- " {\n" -}}
{%- endif -%} {%- endif -%}
{%- if data is mapping -%} {%- if data is mapping -%}
{%- for entry in data|dictsort -%} {%- for entry in data|dictsort -%}
{%- if entry[0] in groupings -%} {%- if entry[0] in groupings -%}
{{- config_entries(entry[1], indents, carryover=entry[0]) -}} {{- config_entries(entry[1], indents, carryover=entry[0]) -}}
{%- else -%} {%- else -%}
{%- if carryover -%} {%- if carryover -%}
{{ carryover|indent(indents, True) }}{{ ' ' }} {{- carryover|indent(indents, True) }}{{ ' ' }}
{%- endif -%} {%- endif -%}
{{ entry[0]|indent(indents, True) }} {{- entry[0]|indent(indents, True) }}
{{- config_entries(entry[1], indents + 2) -}} {{- config_entries(entry[1], indents + 2) -}}
{%- endif -%} {%- endif -%}
{%- endfor -%} {%- endfor -%}
{%- else -%} {%- else -%}
{%- for entry in data -%} {%- for entry in data -%}
{{- config_entries(entry, indents) -}} {{- config_entries(entry, indents) -}}
{%- endfor -%} {%- endfor -%}
{%- endif -%} {%- endif -%}
{%- if indents != 0 and not carryover -%} {%- if indents != 0 and not carryover -%}
{{ '}'|indent(indents - 2, True) }}{{ '\n' }} {{- '}'|indent(indents - 2, True) }}{{ '\n' }}
{%- endif -%} {%- endif -%}
{%- endif -%} {%- endif -%}
{%- endmacro -%} {%- endmacro -%}