From: Jan-Frode Myklebust <janfrode@tanso.net>
Date: Mon, 16 Mar 2009 12:24:45 +0000 (+0100)
Subject: [DOC] Make the status listener example complete.
X-Git-Tag: v1.3.14.13~13
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=8be8d61d7fb0e9f426d10e4220dd851e5fd38e7c;p=haproxy.git

[DOC] Make the status listener example complete.

The example for configuration of "Status report in HTML page"
in haproxy-en.txt/haproxy-fr.txt is incomplete. Gives me the
below error, and had me scratching my head a bit :-)

[ALERT] 074/131807 (26359) : parsing /etc/haproxy/haproxy.cfg : listener
stats has no dispatch address and is not in transparent or balance mode.
[ALERT] 074/131807 (26359) : Errors found in configuration file, aborting.
[ALERT] 074/131807 (26359) : Error reading configuration file :
/etc/haproxy/haproxy.cfg

If adding "balance roundrobin" to the stats stanza is the right fix,
please apply the attached documentation patch to haproxy v1.2 and v1.3.

[w@1wt.eu: this is the right fix up to 1.3.15, not needed in 1.3.16]
(cherry picked from commit dad07a861200d84f68c19de7e84f775b2a0e6cbb)
---

diff --git a/doc/haproxy-en.txt b/doc/haproxy-en.txt
index 73da3d9bc..b07eb65b7 100644
--- a/doc/haproxy-en.txt
+++ b/doc/haproxy-en.txt
@@ -2540,6 +2540,7 @@ Example :
     listen stats :8080
         mode http
         stats uri /
+        balance roundrobin
 
 The "stats auth <user:password>" option enables Basic authentication and adds a
 valid user:password combination to the list of authorized accounts. The user
diff --git a/doc/haproxy-fr.txt b/doc/haproxy-fr.txt
index a70e3c59e..019d075f4 100644
--- a/doc/haproxy-fr.txt
+++ b/doc/haproxy-fr.txt
@@ -2640,6 +2640,7 @@ Example :
     listen stats :8080
         mode http
         stats uri /
+        balance roundrobin
 
 
 L'option "stats auth <user:password>" active l'authentification "Basic" et