From 8ae78378cb77ceb0b642fe7359bc53f34e152785 Mon Sep 17 00:00:00 2001 From: Mischa ter Smitten Date: Mon, 13 Feb 2017 12:51:45 +0100 Subject: [PATCH] Removal of legacy OS (configuration) --- README.md | 2 +- defaults/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4c9e07d8..eb5cb469 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Set up (the latest version of) [HAProxy](http://www.haproxy.org/) in Ubuntu syst * `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 `` 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' if ansible_distribution_version | version_compare('12.04', '>=') else '/var/run/haproxy/admin.sock' }}"}]`]: Sockets 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`) * `haproxy_global_stats.sockets.{n}.param`: [optional]: A list of parameters common to this bind declarations (e.g. `['mode 660', 'level admin', 'process 1']`) * `haproxy_global_stats.timeout`: [optional]: The default timeout on the stats socket diff --git a/defaults/main.yml b/defaults/main.yml index 6c1b1bb9..f1a24bec 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -17,7 +17,7 @@ haproxy_global_log: haproxy_global_chroot: /var/lib/haproxy haproxy_global_stats: sockets: - - listen: "{{ '/run/haproxy/admin.sock' if ansible_distribution_version | version_compare('12.04', '>=') else '/var/run/haproxy/admin.sock' }}" + - listen: /run/haproxy/admin.sock timeout: 30s haproxy_global_user: haproxy haproxy_global_group: haproxy