From 186be19c2731e10629239f9f81416048f67c070c Mon Sep 17 00:00:00 2001 From: hoonetorg Date: Tue, 1 Dec 2015 13:45:07 +0100 Subject: [PATCH] finally fix default section of haproxy.cfg --- haproxy/templates/haproxy.jinja | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/haproxy/templates/haproxy.jinja b/haproxy/templates/haproxy.jinja index c0cee9c..232dd55 100644 --- a/haproxy/templates/haproxy.jinja +++ b/haproxy/templates/haproxy.jinja @@ -89,19 +89,19 @@ userlist {{ id }} #------------------ defaults log {{ salt['pillar.get']('haproxy:defaults:log', 'global') }} -{% if 'mode' in salt['pillar.get']('haproxy:defaults', {}) %} +{%- if 'mode' in salt['pillar.get']('haproxy:defaults', {}) %} mode {{ salt['pillar.get']('haproxy:defaults:mode', 'http') }} {%- endif %} -{%- if 'retries' in salt['pillar.get']('haproxy:defaults', {}) -%} +{%- if 'retries' in salt['pillar.get']('haproxy:defaults', {}) %} retries {{ salt['pillar.get']('haproxy:defaults:retries', '3') }} {%- endif %} -{%- if 'balance' in salt['pillar.get']('haproxy:defaults', {}) -%} +{%- if 'balance' in salt['pillar.get']('haproxy:defaults', {}) %} balance {{ salt['pillar.get']('haproxy:defaults:balance', 'roundrobin') }} {%- endif %} -{%- if 'monitoruri' in salt['pillar.get']('haproxy:defaults', {}) -%} +{%- if 'monitoruri' in salt['pillar.get']('haproxy:defaults', {}) %} monitor-uri {{ salt['pillar.get']('haproxy:defaults:monitoruri') }} {%- endif %} -{%- if 'hashtype' in salt['pillar.get']('haproxy:defaults', {}) -%} +{%- if 'hashtype' in salt['pillar.get']('haproxy:defaults', {}) %} hash-type {{ salt['pillar.get']('haproxy:defaults:hashtype', 'map-based') }} {%- endif %} {%- if 'options' in salt['pillar.get']('haproxy:defaults', {}) -%}