Merge pull request #56 from geerlingguy/revert-53-feature/whitespace-control
Revert "prevent whitespace from jinja control structures from making it into templates"pull/60/head 1.9.2
commit
82575ce142
@ -1,39 +1,33 @@ |
||||
{% for vhost in nginx_vhosts -%} |
||||
{% for vhost in nginx_vhosts %} |
||||
server { |
||||
|
||||
listen {{ vhost.listen | default('80 default_server') }}; |
||||
|
||||
{% if vhost.server_name is defined %} |
||||
server_name {{ vhost.server_name }}; |
||||
{% endif %} |
||||
|
||||
{%- if vhost.root is defined -%} |
||||
{% if vhost.root is defined %} |
||||
root {{ vhost.root }}; |
||||
{% endif %} |
||||
|
||||
{%- if vhost.index is defined -%} |
||||
index {{ vhost.index }}; |
||||
{% endif %} |
||||
index {{ vhost.index | default('index.html index.htm') }}; |
||||
|
||||
{%- if vhost.error_page is defined -%} |
||||
{% if vhost.error_page is defined %} |
||||
error_page {{ vhost.error_page }}; |
||||
{% endif %} |
||||
|
||||
{%- if vhost.access_log is defined -%} |
||||
{% if vhost.access_log is defined %} |
||||
access_log {{ vhost.access_log }}; |
||||
{% endif %} |
||||
|
||||
{%- if vhost.error_log is defined -%} |
||||
{% if vhost.error_log is defined %} |
||||
error_log {{ vhost.error_log }} error; |
||||
{% endif %} |
||||
|
||||
{%- if vhost.return is defined -%} |
||||
{% if vhost.return is defined %} |
||||
return {{ vhost.return }}; |
||||
{% endif %} |
||||
|
||||
{%- if vhost.extra_parameters is defined -%} |
||||
{% if vhost.extra_parameters is defined %} |
||||
{{ vhost.extra_parameters }} |
||||
{% endif %} |
||||
|
||||
} |
||||
{% endfor %} |
||||
|
Reference in new issue