Upstream/ansible-role-nginx
1
0
Fork 0
mirror of https://github.com/geerlingguy/ansible-role-nginx.git synced 2024-11-16 10:35:33 +01:00
Code Issues Projects Releases Wiki Activity

update jinja templates to not leave whitespace from jinja control structures

Browse Source
This commit is contained in:
Benjamin Smith 2016-03-29 13:15:33 -04:00
parent e818255465
commit 295584baf8
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
templates/nginx.conf.j2
View File

@ -10,9 +10,9 @@ events {
multi_accept {{ nginx_multi_accept }}; multi_accept {{ nginx_multi_accept }};
} }
{% if nginx_extra_conf_options %} {% if nginx_extra_conf_options -%}
{{ nginx_extra_conf_options }} {{ nginx_extra_conf_options }}
{% endif %} {%- endif %}
http { http {
include /etc/nginx/mime.types; include /etc/nginx/mime.types;
@ -37,27 +37,28 @@ http {
#gzip on; #gzip on;
{% if nginx_proxy_cache_path %} {%- if nginx_proxy_cache_path -%}
proxy_cache_path {{ nginx_proxy_cache_path }}; proxy_cache_path {{ nginx_proxy_cache_path }};
{% endif %} {% endif %}
{% if nginx_extra_http_options %} {%- if nginx_extra_http_options -%}
{{ nginx_extra_http_options }} {{ nginx_extra_http_options }}
{% endif %} {% endif %}
{% for upstream in nginx_upstreams %} {%- for upstream in nginx_upstreams -%}
upstream {{ upstream.name }} { upstream {{ upstream.name }} {
{% if upstream.strategy is defined %} {%- if upstream.strategy is defined -%}
{{ upstream.strategy }}; {{ upstream.strategy }};
{% endif %} {% endif %}
{% for server in upstream.servers %} {%- for server in upstream.servers -%}
server {{ server }}; server {{ server }};
{% endfor %} {% endfor %}
} }
{% endfor %} {% endfor %}
include {{ nginx_conf_path }}/*.conf; include {{ nginx_conf_path }}/*.conf;
{% if nginx_conf_path != nginx_vhost_path %} {%- if nginx_conf_path != nginx_vhost_path -%}
include {{ nginx_vhost_path }}/*; include {{ nginx_vhost_path }}/*;
{% endif %} {% endif %}
} }

22
templates/vhosts.j2
View File

@ -1,30 +1,36 @@
{% for vhost in nginx_vhosts %} {% for vhost in nginx_vhosts -%}
server { server {
listen {{ vhost.listen | default('80 default_server') }}; listen {{ vhost.listen | default('80 default_server') }};
server_name {{ vhost.server_name }}; server_name {{ vhost.server_name }};
{% if vhost.root is defined %} {%- if vhost.root is defined -%}
root {{ vhost.root }}; root {{ vhost.root }};
{% endif %} {% endif %}
index {{ vhost.index | default('index.html index.htm') }}; {%- if vhost.index is defined -%}
index {{ vhost.index }};
{% endif %}
{% if vhost.error_page is defined %} {%- if vhost.error_page is defined -%}
error_page {{ vhost.error_page }}; error_page {{ vhost.error_page }};
{% endif %} {% endif %}
{% if vhost.access_log is defined %}
{%- if vhost.access_log is defined -%}
access_log {{ vhost.access_log }}; access_log {{ vhost.access_log }};
{% endif %} {% endif %}
{% if vhost.error_log is defined %}
{%- if vhost.error_log is defined -%}
error_log {{ vhost.error_log }} error; error_log {{ vhost.error_log }} error;
{% endif %} {% endif %}
{% if vhost.return is defined %} {%- if vhost.return is defined -%}
return {{ vhost.return }}; return {{ vhost.return }};
{% endif %} {% endif %}
{% if vhost.extra_parameters is defined %} {%- if vhost.extra_parameters is defined -%}
{{ vhost.extra_parameters }} {{ vhost.extra_parameters }}
{% endif %} {% endif %}
} }
{% endfor %} {% endfor %}