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

Compare commits

merge into: Linux-Help:master
Branches Tags
Linux-Help:master
Linux-Help:revert-51-feature/more_modular_template
...
pull from: Linux-Help:revert-51-feature/more_modular_template
Branches Tags
Linux-Help:master
Linux-Help:revert-51-feature/more_modular_template

1 commit
master ... revert-51-

Author SHA1 Message Date
Forrest
2a6d65e8d5 Revert "Feature/more modular template" 2016-04-07 17:43:00 -07:00
1 changed files with 1 additions and 14 deletions
Show stats Expand all files Collapse all files

15
haproxy/templates/haproxy.jinja
View file

@ -89,21 +89,13 @@ userlist {{ id }}
#------------------ #------------------
defaults defaults
log {{ salt['pillar.get']('haproxy:defaults:log', 'global') }} log {{ salt['pillar.get']('haproxy:defaults:log', 'global') }}
{%- if 'mode' in salt['pillar.get']('haproxy:defaults', {}) %}
mode {{ salt['pillar.get']('haproxy:defaults:mode', 'http') }} mode {{ salt['pillar.get']('haproxy:defaults:mode', 'http') }}
{%- endif %}
{%- if 'retries' in salt['pillar.get']('haproxy:defaults', {}) %}
retries {{ salt['pillar.get']('haproxy:defaults:retries', '3') }} retries {{ salt['pillar.get']('haproxy:defaults:retries', '3') }}
{%- endif %}
{%- if 'balance' in salt['pillar.get']('haproxy:defaults', {}) %}
balance {{ salt['pillar.get']('haproxy:defaults:balance', 'roundrobin') }} 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') }} monitor-uri {{ salt['pillar.get']('haproxy:defaults:monitoruri') }}
{%- endif %} {%- endif %}
{%- if 'hashtype' in salt['pillar.get']('haproxy:defaults', {}) %}
hash-type {{ salt['pillar.get']('haproxy:defaults:hashtype', 'map-based') }} hash-type {{ salt['pillar.get']('haproxy:defaults:hashtype', 'map-based') }}
{%- endif %}
{%- if 'options' in salt['pillar.get']('haproxy:defaults', {}) -%} {%- if 'options' in salt['pillar.get']('haproxy:defaults', {}) -%}
{{- render_list_of_dictionaries('option', salt['pillar.get']('haproxy:defaults:options')) }} {{- render_list_of_dictionaries('option', salt['pillar.get']('haproxy:defaults:options')) }}
{%- endif %} {%- endif %}
@ -283,11 +275,6 @@ listen {{ listener.get('name', listener_name) }}
{%- if 'maxconn' in listener %} {%- if 'maxconn' in listener %}
maxconn {{ listener.maxconn }} maxconn {{ listener.maxconn }}
{%- endif %} {%- endif %}
{%- if 'timeouts' in listener %}
{%- for timeout in listener.timeouts %}
timeout {{ timeout }}
{%- endfor %}
{%- endif %}
{%- if 'options' in listener %} {%- if 'options' in listener %}
{%- if listener.options is string %} {%- if listener.options is string %}
option {{ listener.options }} option {{ listener.options }}