From 11fe838f6e5127923e558f8c111719743e274d0e Mon Sep 17 00:00:00 2001 From: Gerardo Vazquez Date: Wed, 9 May 2018 15:44:53 +0200 Subject: [PATCH 1/8] added ca file for ssl certs in frontend --- templates/frontend.cfg | 2 +- vars/main.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/frontend.cfg b/templates/frontend.cfg index d4dd55a..a95b587 100644 --- a/templates/frontend.cfg +++ b/templates/frontend.cfg @@ -5,7 +5,7 @@ frontend {{ item.name }} {%if item.ip is defined %}{{ item.ip }}{% endif %}{%if {% if item.bind is defined -%} {%- for bind in item.bind -%} - bind {{ bind }}{% if item.ssl is defined %}{% if item.ssl.cert is defined %} ssl crt {{ item.ssl.cert }}{% if item.ssl.ciphers is defined %} ciphers {{ item.ssl.ciphers }}{% endif %}{% endif %}{% endif %} + bind {{ bind }}{% if item.ssl is defined %}{% if item.ssl.cert is defined %} ssl crt {{ item.ssl.cert }}{% if item.ssl.ciphers is defined %} ciphers {{ item.ssl.ciphers }}{% endif %} {% if item.ssl.ca is defined%} ca-file {{ item.ssl.ca }} verify required {% endif %}{% endif %}{% endif %} {% endfor -%} {% endif -%} diff --git a/vars/main.yml b/vars/main.yml index 3baea50..adf5b12 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -83,6 +83,7 @@ empty: true # - 192.168.1.2:81 # ssl: # cert: /etc/ssl/private/cert.pem +# ca: /etc/ssl/private/ca.pem # ciphers: 'RC4-SHA:AES128-SHA:AES:!ADH:!aNULL:!DH:!EDH:!eNULL' # maxconn: # monitor: From c31366bdf7ea8e62d7a9bdcaafa8b5d4bd2bd23f Mon Sep 17 00:00:00 2001 From: Gerardo Vazquez Date: Wed, 9 May 2018 17:57:16 +0200 Subject: [PATCH 2/8] changed frontend params in bind --- templates/frontend.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/frontend.cfg b/templates/frontend.cfg index a95b587..833de87 100644 --- a/templates/frontend.cfg +++ b/templates/frontend.cfg @@ -5,7 +5,7 @@ frontend {{ item.name }} {%if item.ip is defined %}{{ item.ip }}{% endif %}{%if {% if item.bind is defined -%} {%- for bind in item.bind -%} - bind {{ bind }}{% if item.ssl is defined %}{% if item.ssl.cert is defined %} ssl crt {{ item.ssl.cert }}{% if item.ssl.ciphers is defined %} ciphers {{ item.ssl.ciphers }}{% endif %} {% if item.ssl.ca is defined%} ca-file {{ item.ssl.ca }} verify required {% endif %}{% endif %}{% endif %} + bind {{ bind }} {% if item.params is defined %}{% for param in item.params %}{{ param }} {% endfor %}{% endif %} {% endfor -%} {% endif -%} From ac9edb7471ca41e6a63f7cb97d4f59312ad24ec6 Mon Sep 17 00:00:00 2001 From: Gerardo Vazquez Date: Thu, 10 May 2018 10:04:43 +0200 Subject: [PATCH 3/8] add params to bind without breaking current configs --- templates/frontend.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/frontend.cfg b/templates/frontend.cfg index 833de87..4826e41 100644 --- a/templates/frontend.cfg +++ b/templates/frontend.cfg @@ -5,7 +5,7 @@ frontend {{ item.name }} {%if item.ip is defined %}{{ item.ip }}{% endif %}{%if {% if item.bind is defined -%} {%- for bind in item.bind -%} - bind {{ bind }} {% if item.params is defined %}{% for param in item.params %}{{ param }} {% endfor %}{% endif %} + bind {{ bind }} }{% if item.ssl is defined %}{% if item.ssl.cert is defined %} ssl crt {{ item.ssl.cert }}{% if item.ssl.ciphers is defined %} ciphers {{ item.ssl.ciphers }}{% endif %}{% endif %}{% endif %} {% if item.params is defined %}{% for param in item.params %}{{ param }} {% endfor %}{% endif %} {% endfor -%} {% endif -%} From 93355f724481fffc497da3707ab1b8735248a57a Mon Sep 17 00:00:00 2001 From: Gerardo Vazquez Date: Thu, 10 May 2018 11:50:57 +0200 Subject: [PATCH 4/8] allow no condition in use_backend --- templates/frontend.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/frontend.cfg b/templates/frontend.cfg index 4826e41..663b004 100644 --- a/templates/frontend.cfg +++ b/templates/frontend.cfg @@ -125,7 +125,7 @@ frontend {{ item.name }} {%if item.ip is defined %}{{ item.ip }}{% endif %}{%if {%- if item.use_backend is defined -%} {%- for backend in item.use_backend -%} - use_backend {{ backend.name }} {{ backend.condition }} + use_backend {{ backend.name }} {% if backend.condition is defined %} {{ backend.condition }} {% endif -%} {% endfor -%} {% endif -%} From 62104797fa6a22ed2f392f6d11a0a5590e9e4feb Mon Sep 17 00:00:00 2001 From: Gerardo Vazquez Date: Thu, 10 May 2018 12:07:10 +0200 Subject: [PATCH 5/8] fix empty condition in use_backend --- templates/frontend.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/frontend.cfg b/templates/frontend.cfg index 663b004..1220ec2 100644 --- a/templates/frontend.cfg +++ b/templates/frontend.cfg @@ -125,7 +125,7 @@ frontend {{ item.name }} {%if item.ip is defined %}{{ item.ip }}{% endif %}{%if {%- if item.use_backend is defined -%} {%- for backend in item.use_backend -%} - use_backend {{ backend.name }} {% if backend.condition is defined %} {{ backend.condition }} {% endif -%} + use_backend {{ backend.name }} {% if 'condition' in item.use_backend %} {{ backend.condition }} {% endif %} {% endfor -%} {% endif -%} From 3febfa61fe41239e5d596d0aeaed4b4acd08df66 Mon Sep 17 00:00:00 2001 From: Gerardo Vazquez Date: Thu, 10 May 2018 12:18:53 +0200 Subject: [PATCH 6/8] fix use_backend variable --- templates/frontend.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/frontend.cfg b/templates/frontend.cfg index 1220ec2..b4d35e1 100644 --- a/templates/frontend.cfg +++ b/templates/frontend.cfg @@ -125,7 +125,7 @@ frontend {{ item.name }} {%if item.ip is defined %}{{ item.ip }}{% endif %}{%if {%- if item.use_backend is defined -%} {%- for backend in item.use_backend -%} - use_backend {{ backend.name }} {% if 'condition' in item.use_backend %} {{ backend.condition }} {% endif %} + use_backend {{ backend.name }} {% if 'condition' in backend %} {{ backend.condition }} {% endif %} {% endfor -%} {% endif -%} From 5f283d7dfe778d390fdaf8ef48c9924bd2932ca0 Mon Sep 17 00:00:00 2001 From: Gerardo Vazquez Date: Thu, 10 May 2018 15:43:03 +0200 Subject: [PATCH 7/8] fix close braces --- templates/frontend.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/frontend.cfg b/templates/frontend.cfg index b4d35e1..4bb8bac 100644 --- a/templates/frontend.cfg +++ b/templates/frontend.cfg @@ -5,7 +5,7 @@ frontend {{ item.name }} {%if item.ip is defined %}{{ item.ip }}{% endif %}{%if {% if item.bind is defined -%} {%- for bind in item.bind -%} - bind {{ bind }} }{% if item.ssl is defined %}{% if item.ssl.cert is defined %} ssl crt {{ item.ssl.cert }}{% if item.ssl.ciphers is defined %} ciphers {{ item.ssl.ciphers }}{% endif %}{% endif %}{% endif %} {% if item.params is defined %}{% for param in item.params %}{{ param }} {% endfor %}{% endif %} + bind {{ bind }} {% if item.ssl is defined %} {% if item.ssl.cert is defined %} ssl crt {{ item.ssl.cert }} {% if item.ssl.ciphers is defined %} ciphers {{ item.ssl.ciphers }} {% endif %}{% endif %}{% endif %} {% if item.params is defined %}{% for param in item.params %} {{ param }} {% endfor %} {% endif %} {% endfor -%} {% endif -%} @@ -125,7 +125,7 @@ frontend {{ item.name }} {%if item.ip is defined %}{{ item.ip }}{% endif %}{%if {%- if item.use_backend is defined -%} {%- for backend in item.use_backend -%} - use_backend {{ backend.name }} {% if 'condition' in backend %} {{ backend.condition }} {% endif %} + use_backend {{ backend.name }} {% if 'condition' in backend %} {{ backend.condition }} {% endif %} {% endfor -%} {% endif -%} From eb0772fcddb2308aa84971407b8e31bf3aee14b8 Mon Sep 17 00:00:00 2001 From: Gerardo Vazquez Date: Thu, 10 May 2018 16:42:09 +0200 Subject: [PATCH 8/8] changed fronted template --- templates/frontend.cfg | 1 + vars/main.yml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/frontend.cfg b/templates/frontend.cfg index 4bb8bac..a32c015 100644 --- a/templates/frontend.cfg +++ b/templates/frontend.cfg @@ -126,6 +126,7 @@ frontend {{ item.name }} {%if item.ip is defined %}{{ item.ip }}{% endif %}{%if {%- if item.use_backend is defined -%} {%- for backend in item.use_backend -%} use_backend {{ backend.name }} {% if 'condition' in backend %} {{ backend.condition }} {% endif %} + {% endfor -%} {% endif -%} diff --git a/vars/main.yml b/vars/main.yml index adf5b12..4db877c 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -83,8 +83,9 @@ empty: true # - 192.168.1.2:81 # ssl: # cert: /etc/ssl/private/cert.pem -# ca: /etc/ssl/private/ca.pem # ciphers: 'RC4-SHA:AES128-SHA:AES:!ADH:!aNULL:!DH:!EDH:!eNULL' +# params: +# - ca-file /etc/ssl/private/certCA.pem # maxconn: # monitor: # uri: