Linux-Help/formula-haproxy
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #13 from MrMarvin/fix/adds_default_values_to_template

Browse source 
adds some default values for essential params
This commit is contained in:
Forrest 2015-07-29 11:03:26 -07:00
commit ada3f793a4
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
haproxy/templates/haproxy.jinja
View file

@ -36,9 +36,9 @@ global
# use- if not designated in their block # use- if not designated in their block
#------------------ #------------------
defaults defaults
log {{ salt['pillar.get']('haproxy:defaults:log') }} log {{ salt['pillar.get']('haproxy:defaults:log', 'global')}}
mode {{ salt['pillar.get']('haproxy:defaults:mode') }} mode {{ salt['pillar.get']('haproxy:defaults:mode', 'http') }}
retries {{ salt['pillar.get']('haproxy:defaults:retries') }} retries {{ salt['pillar.get']('haproxy:defaults:retries', '3') }}
balance {{ salt['pillar.get']('haproxy:defaults:balance', 'roundrobin') }} balance {{ salt['pillar.get']('haproxy:defaults:balance', 'roundrobin') }}
{%- if 'options' in salt['pillar.get']('haproxy:defaults', {}) %} {%- if 'options' in salt['pillar.get']('haproxy:defaults', {}) %}
{%- for option in salt['pillar.get']('haproxy:defaults:options') %} {%- for option in salt['pillar.get']('haproxy:defaults:options') %}
@ -49,7 +49,11 @@ defaults
{%- for timeout in salt['pillar.get']('haproxy:defaults:timeouts') %} {%- for timeout in salt['pillar.get']('haproxy:defaults:timeouts') %}
timeout {{ timeout }} timeout {{ timeout }}
{%- endfor %} {%- endfor %}
{% endif %} {%- else %}
timeout client 1m
timeout connect 10s
timeout server 1m
{%- endif %}
{%- if 'errorfiles' in salt['pillar.get']('haproxy:defaults', {}) %} {%- if 'errorfiles' in salt['pillar.get']('haproxy:defaults', {}) %}
{%- for errorfile in salt['pillar.get']('haproxy:defaults:errorfiles').iteritems() %} {%- for errorfile in salt['pillar.get']('haproxy:defaults:errorfiles').iteritems() %}
errorfile {{ errorfile[0] }} {{ errorfile[1] }} errorfile {{ errorfile[0] }} {{ errorfile[1] }}