Skip to content

Commit

Permalink
Merge pull request #39 from ojan/master
Browse files Browse the repository at this point in the history
add global_option
  • Loading branch information
tersmitten authored Jan 30, 2017
2 parents 091a868 + 99779ce commit 4d21a53
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
1 change: 1 addition & 0 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ haproxy_global_ssl_default_bind_options: 'no-sslv3'
haproxy_global_ssl_default_server_ciphers: 'kEECDH+aRSA+AES:kRSA+AES:+AES256:RC4-SHA:!kEDH:!LOW:!EXP:!MD5:!aNULL:!eNULL'
haproxy_global_ssl_default_server_options: 'no-sslv3'
haproxy_global_nbproc: 1
haproxy_global_option: []

# defaults section
haproxy_defaults_log: global
Expand Down
6 changes: 6 additions & 0 deletions templates/etc/haproxy/global.cfg.j2
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,9 @@
{% for tune in haproxy_global_tune | default([]) %}
tune.{{ tune.key }} {{ tune.value }}
{% endfor %}

{% if haproxy_global_option != false %}
{% for option in haproxy_global_option %}
{{ option }}
{% endfor %}
{% endif %}

0 comments on commit 4d21a53

Please sign in to comment.