From fc731a65c350e338be61ff60784ef480cb0d5a96 Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Mon, 5 Mar 2018 13:33:21 -0500 Subject: [PATCH 1/3] Add support for multiple force_persist options and for use_server options --- templates/backend.cfg | 10 +++++++++- templates/frontend.cfg | 8 ++++++++ templates/listen.cfg | 9 ++++++++- vars/main.yml | 3 +++ 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/templates/backend.cfg b/templates/backend.cfg index 0041608..8ddb1d7 100644 --- a/templates/backend.cfg +++ b/templates/backend.cfg @@ -130,5 +130,13 @@ {% endif -%} {% if item.force_persist is defined -%} - force-persist {{ item.force_persist }} + {%- for force_persist in item.force_persist -%} + force-persist {{ force_persist }} + {% endfor -%} + {% endif -%} + + {% if item.use_server is defined -%} + {%- for use_server in item.use_server -%} + use-server {{ use_server }} + {% endfor -%} {% endif -%} diff --git a/templates/frontend.cfg b/templates/frontend.cfg index d4dd55a..5d30a16 100644 --- a/templates/frontend.cfg +++ b/templates/frontend.cfg @@ -130,5 +130,13 @@ frontend {{ item.name }} {%if item.ip is defined %}{{ item.ip }}{% endif %}{%if {% endif -%} {% if item.force_persist is defined -%} + {%- for force_persist in item.force_persist -%} force-persist {{ item.force_persist }} + {% endfor -%} + {% endif -%} + + {% if item.use_server is defined -%} + {%- for use_server in item.use_server -%} + use-server {{ item.use_server }} + {% endfor -%} {% endif -%} diff --git a/templates/listen.cfg b/templates/listen.cfg index ab1c5ad..24f16aa 100644 --- a/templates/listen.cfg +++ b/templates/listen.cfg @@ -111,5 +111,12 @@ listen {{ item.name }} {% endif -%} {% endif %} {% if item.force_persist is defined -%} - force-persist {{ item.force_persist }} +{%- for force_persist in item.force_persist -%} + force-persist {{ force_persist }} +{% endfor -%} +{% endif -%} +{% if item.use_server is defined -%} +{%- for use_server in item.use_server -%} + use-server {{ use_server }} +{% endfor -%} {% endif -%} diff --git a/vars/main.yml b/vars/main.yml index 3baea50..7cbaa49 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -129,6 +129,9 @@ empty: true # rspirep: # - "^Location:\ 127.0.0.1:8080 Location:\ www.mydomain.com" # force_persist: +# - if hdr(Host) serverX +# use_server:: +# - server if hdr(Host) serverX # #haproxy_backends: # - name: From fff3efcf5f6f1062982d7348a928779d81aa4927 Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Mon, 5 Mar 2018 13:36:00 -0500 Subject: [PATCH 2/3] Remove item. construct inside for loop --- templates/frontend.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/frontend.cfg b/templates/frontend.cfg index 5d30a16..eb71fd8 100644 --- a/templates/frontend.cfg +++ b/templates/frontend.cfg @@ -131,12 +131,12 @@ frontend {{ item.name }} {%if item.ip is defined %}{{ item.ip }}{% endif %}{%if {% if item.force_persist is defined -%} {%- for force_persist in item.force_persist -%} - force-persist {{ item.force_persist }} + force-persist {{ force_persist }} {% endfor -%} {% endif -%} {% if item.use_server is defined -%} {%- for use_server in item.use_server -%} - use-server {{ item.use_server }} + use-server {{ use_server }} {% endfor -%} {% endif -%} From 56f04bd8e3b784c2a08b59c64ff06579585c9a92 Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Mon, 5 Mar 2018 13:39:05 -0500 Subject: [PATCH 3/3] Remove the extra colon --- vars/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/main.yml b/vars/main.yml index 7cbaa49..0d64375 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -130,7 +130,7 @@ empty: true # - "^Location:\ 127.0.0.1:8080 Location:\ www.mydomain.com" # force_persist: # - if hdr(Host) serverX -# use_server:: +# use_server: # - server if hdr(Host) serverX # #haproxy_backends: