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

Merge pull request #50 from hoonetorg/feature/modular_log

Browse source 
allow to set arbitrary log options in global
This commit is contained in:
John Keates 2017-08-25 17:29:28 +02:00 committed by GitHub
commit 40c7ac8c70
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
haproxy/templates/haproxy.jinja
View file

@ -23,8 +23,14 @@
# Global settings # Global settings
#------------------ #------------------
global global
{%- if salt['pillar.get']('haproxy:global:log', []) != [] %}
{%- for log in salt['pillar.get']('haproxy:global:log') %}
log {{log}}
{%- endfor %}
{%- else %}
log /dev/log local0 log /dev/log local0
log /dev/log local1 notice log /dev/log local1 notice
{%- endif %}
user {{ salt['pillar.get']('haproxy:global:user', 'haproxy') }} user {{ salt['pillar.get']('haproxy:global:user', 'haproxy') }}
group {{ salt['pillar.get']('haproxy:global:group', 'haproxy') }} group {{ salt['pillar.get']('haproxy:global:group', 'haproxy') }}
{%- if salt['pillar.get']('haproxy:global:chroot:enable', 'no') == True %} {%- if salt['pillar.get']('haproxy:global:chroot:enable', 'no') == True %}

3
pillar.example
View file

@ -7,6 +7,9 @@ haproxy:
overwrite: True # Overwrite an existing config file if present (default behaviour unless set to false) overwrite: True # Overwrite an existing config file if present (default behaviour unless set to false)
config_file_path: /etc/haproxy/haproxy.cfg config_file_path: /etc/haproxy/haproxy.cfg
global: global:
log:
- 127.0.0.1 local2
- 127.0.0.1 local1 notice
stats: stats:
enable: True enable: True
socketpath: /var/lib/haproxy/stats socketpath: /var/lib/haproxy/stats