Linux-Help/formula-haproxy
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

added mode selection for stats socket in global definitions

Browse source
This commit is contained in:
Andrew Repulo 2016-08-11 18:49:06 +03:00
parent b69c7edebd
commit e7cddfe0e2
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.rst
View file

@ -35,7 +35,7 @@ Currently, only a handful of options can be set using the pillar:
- Global - Global
+ stats: enable stats, curently only via a unix socket which can be set to a path + stats: enable stats, curently only via a unix socket which can be set to a path with custom permissions
+ user: sets the user haproxy shall run as + user: sets the user haproxy shall run as
+ group: sets the group haproxy shall run as + group: sets the group haproxy shall run as
+ chroot: allows you to turn on chroot and set a directory + chroot: allows you to turn on chroot and set a directory

2
haproxy/templates/haproxy.jinja
View file

@ -34,7 +34,7 @@ global
daemon daemon
{%- endif %} {%- endif %}
{%- if salt['pillar.get']('haproxy:global:stats:enable', 'no') == True %} {%- if salt['pillar.get']('haproxy:global:stats:enable', 'no') == True %}
stats socket {{ salt['pillar.get']('haproxy:global:stats:socketpath', '/tmp/ha_stats.sock') }} level {{ salt['pillar.get']('haproxy:global:stats:level', 'operator') }} 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') }}
{%- endif %} {%- endif %}
{%- if 'maxconn' in salt['pillar.get']('haproxy:global', {}) %} {%- if 'maxconn' in salt['pillar.get']('haproxy:global', {}) %}
maxconn {{ salt['pillar.get']('haproxy:global:maxconn') }} maxconn {{ salt['pillar.get']('haproxy:global:maxconn') }}

1
pillar.example
View file

@ -10,6 +10,7 @@ haproxy:
stats: stats:
enable: True enable: True
socketpath: /var/lib/haproxy/stats socketpath: /var/lib/haproxy/stats
mode: 660
level: admin level: admin
ssl-default-bind-ciphers: "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384" ssl-default-bind-ciphers: "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384"
ssl-default-bind-options: "no-sslv3 no-tlsv10 no-tlsv11" ssl-default-bind-options: "no-sslv3 no-tlsv10 no-tlsv11"