diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index ceb43f0..8ca83f3 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -26,6 +26,6 @@ provisioner: lint: | set -e yamllint . - ansible-lint + ansible-lint . verifier: name: testinfra diff --git a/templates/haproxy.cfg.j2 b/templates/haproxy.cfg.j2 index 32ededd..923469b 100644 --- a/templates/haproxy.cfg.j2 +++ b/templates/haproxy.cfg.j2 @@ -3,41 +3,41 @@ global {% for key, value in haproxy_full_global.items() %} {% if value is sameas true %} - {{ key }} + {{ key }} {% elif value is iterable and value is not string %} {% for option in value %} - {{ key }} {{ option }} + {{ key }} {{ option }} {% endfor %} {% else %} - {{ key }} {{ value }} + {{ key }} {{ value }} {% endif %} {% endfor %} defaults {% for key, value in haproxy_full_defaults.items() %} {% if value is sameas true %} - {{ key }} + {{ key }} {% elif value is iterable and value is not string %} {% for option in value %} - {{ key }} {{ option }} + {{ key }} {{ option }} {% endfor %} {% else %} - {{ key }} {{ value }} + {{ key }} {{ value }} {% endif %} {% endfor %} listen stats {% for key, value in haproxy_full_listen_stats.items() %} {% if key == "bind" %} - bind {{ value["ip"] }}:{{ value["port"] }} + bind {{ value["ip"] }}:{{ value["port"] }} {% elif value is sameas true %} - {{ key }} + {{ key }} {% elif value is iterable and value is not string %} {% for option in value %} - {{ key }} {{ option }} + {{ key }} {{ option }} {% endfor %} {% else %} - {{ key }} {{ value }} + {{ key }} {{ value }} {% endif %} {% endfor %} @@ -46,10 +46,10 @@ resolvers {{ resolver }} {% for key, value in config.items() %} {% if value is iterable and value is not string %} {% for option in value %} - {{ key }} {{ option }} + {{ key }} {{ option }} {% endfor %} {% else %} - {{ key }} {{ value }} + {{ key }} {{ value }} {% endif %} {% endfor %} @@ -57,7 +57,7 @@ resolvers {{ resolver }} {% for http_error_name, config in haproxy_http_errors.items() %} http-errors {{ http_error_name }} {% for status_code, file in config.items() %} - errorfile {{ status_code }} /etc/haproxy/errors/{{ file }}.http + errorfile {{ status_code }} /etc/haproxy/errors/{{ file }}.http {% endfor %} {% endfor %} @@ -66,10 +66,10 @@ userlist {{ userlist }} {% for key, value in config.items() %} {% if value is iterable and value is not string %} {% for option in value %} - {{ key }} {{ option }} + {{ key }} {{ option }} {% endfor %} {% else %} - {{ key }} {{ value }} + {{ key }} {{ value }} {% endif %} {% endfor %} @@ -78,15 +78,15 @@ userlist {{ userlist }} frontend {{ frontend }} {% for key, value in config.items() %} {% if key == "bind" %} - bind {{ value["ip"] }}:{{ value["port"] }}{% if value["ssl"] is defined %} ssl{% if value["ssl"]["ciphers"] is defined %} ciphers {{ value["ssl"]["ciphers"]|join(':') }}{% endif %}{% if value["ssl"]["crt"]%} crt {% if value["ssl"]["crt"] is string %}{{ value["ssl"]["crt"] }}{% else %}{{ value["ssl"]["crt"]|join(' crt ') }}{% endif %}{% endif %} + bind {{ value["ip"] }}:{{ value["port"] }}{% if value["ssl"] is defined %} ssl{% if value["ssl"]["ciphers"] is defined %} ciphers {{ value["ssl"]["ciphers"]|join(':') }}{% endif %}{% if value["ssl"]["crt"]%} crt {% if value["ssl"]["crt"] is string %}{{ value["ssl"]["crt"] }}{% else %}{{ value["ssl"]["crt"]|join(' crt ') }}{% endif %}{% endif %} {% endif %} {% elif value is iterable and value is not string %} {% for option in value %} - {{ key }} {{ option }} + {{ key }} {{ option }} {% endfor %} {% else %} - {{ key }} {{ value }} + {{ key }} {{ value }} {% endif %} {% endfor %} @@ -96,13 +96,13 @@ frontend {{ frontend }} backend {{ backend }} {% for key, value in config.items() %} {% if value is sameas true %} - {{ key }} + {{ key }} {% elif value is iterable and value is not string %} {% for option in value %} - {{ key }} {{ option }} + {{ key }} {{ option }} {% endfor %} {% else %} - {{ key }} {{ value }} + {{ key }} {{ value }} {% endif %} {% endfor %}