ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ceph-rgw-loadbalancer: Fix SSL newline issue 

The ad7a5da commit introduced a regression when using TLS on haproxy
via the haproxy_frontend_ssl_certificate variable.
This cause the "stats socket" and the "tune.ssl.default-dh-param"
parameters to be on the same line resulting haproxy failing to start.

[ALERT] 351/140240 (21388) : parsing [xxxxx] : 'stats socket' : unknown
keyword 'tune.ssl.default-dh-param'. Registered
[ALERT] 351/140240 (21388) : Fatal errors found in configuration.

Fixes: #4869

Signed-off-by: Florian Faltermeier <florian.faltermeier@uibk.ac.at>
pull/5054/head
Florian Faltermeier 2019-12-18 14:31:57 +01:00 committed by Guillaume Abrioux
parent 16e12bf2bb
commit 9d081e2453
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/ceph-rgw-loadbalancer/templates/haproxy.cfg.j2
View File

@ -9,7 +9,7 @@ global
group haproxy group haproxy
daemon daemon
stats socket /var/lib/haproxy/stats stats socket /var/lib/haproxy/stats
{%- if haproxy_frontend_ssl_certificate %} {% if haproxy_frontend_ssl_certificate %}
tune.ssl.default-dh-param {{ haproxy_ssl_dh_param }} tune.ssl.default-dh-param {{ haproxy_ssl_dh_param }}
ssl-default-bind-ciphers {{ haproxy_ssl_ciphers | join(':') }} ssl-default-bind-ciphers {{ haproxy_ssl_ciphers | join(':') }}
ssl-default-bind-options {{ haproxy_ssl_options | join(' ') }} ssl-default-bind-options {{ haproxy_ssl_options | join(' ') }}