Skip to content

Commit 60e8d19

Browse files
committed
ci(salt-lint): fix
1 parent d921a49 commit 60e8d19

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

haproxy/templates/haproxy.jinja

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
global
2626
{%- if salt['pillar.get']('haproxy:global:log', []) != [] %}
2727
{%- for log in salt['pillar.get']('haproxy:global:log') %}
28-
log {{log}}
28+
log {{ log }}
2929
{%- endfor %}
3030
{%- else %}
3131
log /dev/log local0
@@ -46,7 +46,10 @@ global
4646
daemon
4747
{%- endif %}
4848
{%- if salt['pillar.get']('haproxy:global:stats:enable', 'no') == True %}
49-
stats socket {{ salt['pillar.get']('haproxy:global:stats:socketpath', '/tmp/ha_stats.sock') }} mode {{ salt['pillar.get']('haproxy:global:stats:mode', '660') }} level {{ salt['pillar.get']('haproxy:global:stats:level', 'operator') }}{% if 'extra' in salt['pillar.get']('haproxy:global:stats', {}) %} {{ salt['pillar.get']('haproxy:global:stats:extra') }}{% endif %}
49+
{%- set socketpath = salt['pillar.get']('haproxy:global:stats:socketpath', '/tmp/ha_stats.sock') %}
50+
{%- set mode = salt['pillar.get']('haproxy:global:stats:mode', '660') %}
51+
{%- set level = salt['pillar.get']('haproxy:global:stats:level', 'operator') %}
52+
stats socket {{ socketpath }} mode {{ mode }} level {{ level }}{% if 'extra' in salt['pillar.get']('haproxy:global:stats', {}) %} {{ salt['pillar.get']('haproxy:global:stats:extra') }}{% endif %}
5053
{%- endif %}
5154
{%- if 'maxconn' in salt['pillar.get']('haproxy:global', {}) %}
5255
maxconn {{ salt['pillar.get']('haproxy:global:maxconn') }}
@@ -368,7 +371,8 @@ listen {{ listener.get('name', listener_name) }}
368371
{%- endif %}
369372
{%- if 'servers' in listener %}
370373
{%- for server_name, server in listener.servers|dictsort %}
371-
server {{ server.get('name', server_name) }} {{ server.host }}{% if 'port' in server %}:{{ server.port }}{% endif %} {% if 'maxconn' in server %} maxconn {{ server.maxconn }}{% endif %} {{ server.get('check', '') }} {{ server.get('extra', '') }}
374+
{%- set name = server.get('name', server_name) %}
375+
server {{ name }} {{ server.host }}{% if 'port' in server %}:{{ server.port }}{% endif %} {% if 'maxconn' in server %} maxconn {{ server.maxconn }}{% endif %} {{ server.get('check', '') }} {{ server.get('extra', '') }}
372376
{%- endfor %}
373377
{%- endif %}
374378
{% endfor %}

0 commit comments

Comments
 (0)