saltstack-formulas/nginx-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

suppress newlines

Browse Source
This commit is contained in:
Kent Shultz 2014-05-29 14:13:25 -07:00
parent c90a12d9f5
commit 8f894ea6e6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nginx/templates/config.jinja
View File

@ -55,14 +55,14 @@ http {
} }
} }
{% if pillar['nginx'] is defined -%} {% if pillar['nginx'] is defined -%}
{% if pillar['nginx']['redirect_numeric_ip']|default(False) %} {% if pillar['nginx']['redirect_numeric_ip']|default(False) -%}
server { server {
server_name {% for ip in salt['network.interfaces']()['eth0']['inet'] %}{{ ip['address'] }}:80{% if not loop.last %} {% endif %}{% endfor %}; server_name {% for ip in salt['network.interfaces']()['eth0']['inet'] %}{{ ip['address'] }}:80{% if not loop.last %} {% endif %}{% endfor %};
return 302 {{ pillar['nginx']['redirect_numeric_ip'] }}; return 302 {{ pillar['nginx']['redirect_numeric_ip'] }};
access_log off; access_log off;
} }
{% endif %} {% endif -%}
{% endif %} {% endif -%}
include /etc/nginx/conf.d/*.conf; include /etc/nginx/conf.d/*.conf;
include /etc/nginx/sites-enabled/*.conf; include /etc/nginx/sites-enabled/*.conf;