Make haproxy_global_chroot optional

Oefenweb · Jun 14, 2017 · 8019090 · 8019090
1 parent 3a3bbd1
commit 8019090
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ Set up (the latest version of) [HAProxy](http://www.haproxy.org/) in Ubuntu syst
 * `haproxy_global_log.{n}.level`: [optional]: Can be specified to filter outgoing messages (e.g. `notice`)
 * `haproxy_global_log.{n}.minlevel`: [optional]: Can be specified to filter outgoing messages (e.g. `notice`)
 * `haproxy_global_log.{n}.format`: [optional]: Specifies the log format string to use for traffic logs (e.g. `%{+Q}o\ %t\ %s\ %{-Q}r`)
-* `haproxy_global_chroot`: [default: `/var/lib/haproxy`]: Changes current directory to `<jail dir>` and performs a `chroot()` there before dropping privileges
+* `haproxy_global_chroot`: [optional]: Changes current directory to `<jail dir>` and performs a `chroot()` there before dropping privileges
 * `haproxy_global_stats`: [default: See `defaults/main.yml`]: Stats declarations
 * `haproxy_global_stats.sockets`:  [default: `[{listen: /run/haproxy/admin.sock }}"}]`]: Sockets declarations
 * `haproxy_global_stats.sockets.{n}.listen`:  [required]: Defines a listening address and/or ports (e.g. `/run/haproxy/admin.sock`)

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -14,7 +14,6 @@ haproxy_global_log:
   - address: /dev/log
     facility: local1
     level: notice
-haproxy_global_chroot: /var/lib/haproxy
 haproxy_global_stats:
   sockets:
     - listen: /run/haproxy/admin.sock

diff --git a/templates/etc/haproxy/global.cfg.j2 b/templates/etc/haproxy/global.cfg.j2
@@ -8,7 +8,7 @@
 {% endfor %}
 {% endif %}
 
-{% if haproxy_global_chroot != false %}
+{% if haproxy_global_chroot is defined %}
   chroot {{ haproxy_global_chroot }}
 {% endif %}