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

Revert "Added block statements (not parsed, simply looped and put in to the configuration) for frontends"

Browse source 
in order to move that into a branch

This reverts commit 76bc908e3e.
This commit is contained in:
Bernd Fischbach 2015-12-07 10:11:45 +01:00
parent 76bc908e3e
commit b485501fcb
2 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.rst
View file

@ -59,7 +59,6 @@ Currently, only a handful of options can be set using the pillar:
+ reqadd: an array of reqadd statements. Looped over and put in the configuration, no parsing + reqadd: an array of reqadd statements. Looped over and put in the configuration, no parsing
+ default_backend: sets the default backend + default_backend: sets the default backend
+ acls: a list of acls, not parsed, simply looped and put in to the configuration + acls: a list of acls, not parsed, simply looped and put in to the configuration
+ blocks: a list of block statements, not parsed, simply looped and put in to the configuration
+ use_backends: a list of use_backend statements, looped over, not parsed + use_backends: a list of use_backend statements, looped over, not parsed
- Backend; Backend(s) is a list of the backends you desire to have in your haproxy setup, per backend you can set: - Backend; Backend(s) is a list of the backends you desire to have in your haproxy setup, per backend you can set:

3
haproxy/templates/haproxy.jinja
View file

@ -353,9 +353,6 @@ frontend {{ frontend.get('name', frontend_name) }}
{%- if 'acls' in frontend %} {%- if 'acls' in frontend %}
{{- render_list_of_dictionaries('acl', frontend.acls) }} {{- render_list_of_dictionaries('acl', frontend.acls) }}
{%- endif %} {%- endif %}
{%- if 'blocks' in frontend %}
{{- render_list_of_dictionaries('block', frontend.blocks) }}
{%- endif %}
{%- if 'monitoruri' in frontend %} {%- if 'monitoruri' in frontend %}
monitor-uri {{ frontend.monitoruri }} monitor-uri {{ frontend.monitoruri }}
{%- endif %} {%- endif %}