From 8f894ea6e65a0bbc0ed2f5b09f962753f1e64049 Mon Sep 17 00:00:00 2001 From: Kent Shultz Date: Thu, 29 May 2014 14:13:25 -0700 Subject: [PATCH] suppress newlines --- nginx/templates/config.jinja | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nginx/templates/config.jinja b/nginx/templates/config.jinja index 6c67ed6..1d26c65 100644 --- a/nginx/templates/config.jinja +++ b/nginx/templates/config.jinja @@ -55,14 +55,14 @@ http { } } {% if pillar['nginx'] is defined -%} -{% if pillar['nginx']['redirect_numeric_ip']|default(False) %} +{% if pillar['nginx']['redirect_numeric_ip']|default(False) -%} server { 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'] }}; access_log off; } -{% endif %} -{% endif %} +{% endif -%} +{% endif -%} include /etc/nginx/conf.d/*.conf; include /etc/nginx/sites-enabled/*.conf;