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

Merge pull request #53 from benjamin-smith/feature/whitespace-control

Browse Source 
prevent whitespace from jinja control structures from making it into templates
This commit is contained in:
Jeff Geerling 2016-05-06 11:16:33 -05:00
commit f7e43de918
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 }};
}
{% if nginx_extra_conf_options %}
{% if nginx_extra_conf_options -%}
{{ nginx_extra_conf_options }}
{% endif %}
{%- endif %}
http {
include {{ nginx_mime_file_path }};
@ -37,27 +37,28 @@ http {
#gzip on;
{% if nginx_proxy_cache_path %}
{%- if nginx_proxy_cache_path -%}
proxy_cache_path {{ nginx_proxy_cache_path }};
{% endif %}
{% if nginx_extra_http_options %}
{%- if nginx_extra_http_options -%}
{{ nginx_extra_http_options }}
{% endif %}
{% for upstream in nginx_upstreams %}
{%- for upstream in nginx_upstreams -%}
upstream {{ upstream.name }} {
{% if upstream.strategy is defined %}
{%- if upstream.strategy is defined -%}
{{ upstream.strategy }};
{% endif %}
{% for server in upstream.servers %}
{%- for server in upstream.servers -%}
server {{ server }};
{% endfor %}
}
{% endfor %}
include {{ nginx_conf_path }}/*.conf;
{% if nginx_conf_path != nginx_vhost_path %}
{%- if nginx_conf_path != nginx_vhost_path -%}
include {{ nginx_vhost_path }}/*;
{% endif %}
}

22
templates/vhosts.j2
View File

@ -1,33 +1,39 @@
{% 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 %}
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 }};
{% 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 %}