Skip to content

Commit

Permalink
Merge pull request #21 from Aversiste/haproxy-config-dir
Browse files Browse the repository at this point in the history
Smoother default configuration
  • Loading branch information
Olivier Locard authored Apr 11, 2019
2 parents e20154b + a1e2498 commit b160bd5
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
17 changes: 9 additions & 8 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# defaults file for haproxy
haproxy_config_dir: "{{ _haproxy_config_dir }}"
haproxy_config_file: "{{ _haproxy_config_dir }}/haproxy.cfg"
haproxy_chroot_dir: "{{ _haproxy_chroot_dir }}"

haproxy_package_name: "{{ _haproxy_package_name }}"
haproxy_extra_packages: "{{ _haproxy_extra_packages }}"
Expand All @@ -19,7 +20,7 @@ haproxy_global:
- address: /dev/log
facility: local1
level: notice
chroot: /var/lib/haproxy
chroot: "{{ haproxy_chroot_dir }}"
user: haproxy
group: haproxy
daemon: true
Expand Down Expand Up @@ -57,19 +58,19 @@ haproxy_defaults:
- dontlognull
errorfile:
- code: 400
file: /etc/haproxy/errors/400.http
file: "{{ haproxy_config_dir }}/errors/400.http"
- code: 403
file: /etc/haproxy/errors/403.http
file: "{{ haproxy_config_dir }}/errors/403.http"
- code: 408
file: /etc/haproxy/errors/408.http
file: "{{ haproxy_config_dir }}/errors/408.http"
- code: 500
file: /etc/haproxy/errors/500.http
file: "{{ haproxy_config_dir }}/errors/500.http"
- code: 502
file: /etc/haproxy/errors/502.http
file: "{{ haproxy_config_dir }}/errors/502.http"
- code: 503
file: /etc/haproxy/errors/503.http
file: "{{ haproxy_config_dir }}/errors/503.http"
- code: 504
file: /etc/haproxy/errors/504.http
file: "{{ haproxy_config_dir }}/errors/504.http"

haproxy_resolvers: []
haproxy_backends: []
Expand Down
1 change: 1 addition & 0 deletions vars/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
_haproxy_etc_prefix: /etc
_haproxy_config_dir: "{{ _haproxy_etc_prefix }}/haproxy"
_haproxy_config_file: "{{ _haproxy_config_dir }}/haproxy.cfg"
_haproxy_chroot_dir: /var/lib/haproxy

_haproxy_package_name: haproxy
_haproxy_extra_packages:
Expand Down

0 comments on commit b160bd5

Please sign in to comment.