1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[DOC] cleanup of the keyword matrix

Browse Source 
The keyword matrix was barely readable due to the long lines.
Also let's repeat the legend every 24 lines.
This commit is contained in:
Willy Tarreau 2010-02-26 13:34:29 +01:00
parent d63335a861
commit 5c6f7b360e
1 changed files with 144 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
doc/configuration.txt
View File

@ -771,7 +771,7 @@ The following list of keywords is supported. Most of them may only be used in a
limited set of section types. Some of them are marked as "deprecated" because limited set of section types. Some of them are marked as "deprecated" because
they are inherited from an old syntax which may be confusing or functionally they are inherited from an old syntax which may be confusing or functionally
limited, and there are new recommended keywords to replace them. Keywords limited, and there are new recommended keywords to replace them. Keywords
listed with [no] can be optionally inverted using the "no" prefix, eg. "no marked with "(*)" can be optionally inverted using the "no" prefix, eg. "no
option contstats". This makes sense when the option has been enabled by default option contstats". This makes sense when the option has been enabled by default
and must be disabled for a specific instance. Such options may also be prefixed and must be disabled for a specific instance. Such options may also be prefixed
with "default" in order to restore default settings regardless of what has been with "default" in order to restore default settings regardless of what has been
@ -779,7 +779,7 @@ specified in a previous "defaults" section.
keyword defaults frontend listen backend keyword defaults frontend listen backend
----------------------+----------+----------+---------+--------- ------------------------------------+----------+----------+---------+---------
acl - X X X acl - X X X
appsession - - X X appsession - - X X
backlog X X X - backlog X X X -
@ -790,8 +790,8 @@ block - X X X
capture cookie - X X - capture cookie - X X -
capture request header - X X - capture request header - X X -
capture response header - X X - capture response header - X X -
clitimeout X X X - (deprecated) clitimeout (deprecated) X X X -
contimeout X - X X (deprecated) contimeout (deprecated) X - X X
cookie X - X X cookie X - X X
default-server X - X X default-server X - X X
default_backend X X X - default_backend X X X -
@ -802,6 +802,7 @@ enabled X X X X
errorfile X X X X errorfile X X X X
errorloc X X X X errorloc X X X X
errorloc302 X X X X errorloc302 X X X X
-- keyword -------------------------- defaults - frontend - listen -- backend -
errorloc303 X X X X errorloc303 X X X X
fullconn X - X X fullconn X - X X
grace X X X X grace X X X X
@ -815,58 +816,51 @@ mode X X X X
monitor fail - X X - monitor fail - X X -
monitor-net X X X - monitor-net X X X -
monitor-uri X X X - monitor-uri X X X -
[no] option abortonclose X - X X option abortonclose (*) X - X X
[no] option accept-invalid- option accept-invalid-http-request (*) X X X -
http-request X X X - option accept-invalid-http-response (*) X - X X
[no] option accept-invalid- option allbackups (*) X - X X
http-response X - X X option checkcache (*) X - X X
[no] option allbackups X - X X option clitcpka (*) X X X -
[no] option checkcache X - X X option contstats (*) X X X -
[no] option clitcpka X X X - option dontlog-normal (*) X X X -
[no] option contstats X X X - option dontlognull (*) X X X -
[no] option dontlog-normal X X X - option forceclose (*) X X X X
[no] option dontlognull X X X - -- keyword -------------------------- defaults - frontend - listen -- backend -
[no] option forceclose X X X X
option forwardfor X X X X option forwardfor X X X X
[no] option http-server- option http-server-close (*) X X X X
close X X X X option http-use-proxy-header (*) X X X -
[no] option http-use-proxy-
header X X X -
option httpchk X - X X option httpchk X - X X
[no] option httpclose X X X X option httpclose (*) X X X X
option httplog X X X X option httplog X X X X
[no] option http_proxy X X X X option http_proxy (*) X X X X
[no] option independant- option independant-streams (*) X X X X
streams X X X X option log-health-checks (*) X - X X
[no] option log-health- X - X X option log-separate-errors (*) X X X -
checks option logasap (*) X X X -
[no] option log-separate-
errors X X X -
[no] option logasap X X X -
option mysql-check X - X X option mysql-check X - X X
[no] option nolinger X X X X option nolinger (*) X X X X
option originalto X X X X option originalto X X X X
[no] option persist X - X X option persist (*) X - X X
[no] option redispatch X - X X option redispatch (*) X - X X
option smtpchk X - X X option smtpchk X - X X
[no] option socket-stats X X X - option socket-stats (*) X X X -
[no] option splice-auto X X X X option splice-auto (*) X X X X
[no] option splice-request X X X X option splice-request (*) X X X X
[no] option splice-response X X X X option splice-response (*) X X X X
[no] option srvtcpka X - X X option srvtcpka (*) X - X X
option ssl-hello-chk X - X X option ssl-hello-chk X - X X
[no] option tcp-smart- -- keyword -------------------------- defaults - frontend - listen -- backend -
accept X X X - option tcp-smart-accept (*) X X X -
[no] option tcp-smart- option tcp-smart-connect (*) X - X X
connect X - X X
option tcpka X X X X option tcpka X X X X
option tcplog X X X X option tcplog X X X X
[no] option transparent X - X X option transparent (*) X - X X
persist rdp-cookie X - X X persist rdp-cookie X - X X
rate-limit sessions X X X - rate-limit sessions X X X -
redirect - X X X redirect - X X X
redisp X - X X (deprecated) redisp (deprecated) X - X X
redispatch X - X X (deprecated) redispatch (deprecated) X - X X
reqadd - X X X reqadd - X X X
reqallow - X X X reqallow - X X X
reqdel - X X X reqdel - X X X
@ -880,6 +874,7 @@ reqisetbe - X X X
reqitarpit - X X X reqitarpit - X X X
reqpass - X X X reqpass - X X X
reqrep - X X X reqrep - X X X
-- keyword -------------------------- defaults - frontend - listen -- backend -
reqsetbe - X X X reqsetbe - X X X
reqtarpit - X X X reqtarpit - X X X
retries X - X X retries X - X X
@ -892,7 +887,7 @@ rspirep - X X X
rsprep - X X X rsprep - X X X
server - - X X server - - X X
source X - X X source X - X X
srvtimeout X - X X (deprecated) srvtimeout (deprecated) X - X X
stats auth X - X X stats auth X - X X
stats enable X - X X stats enable X - X X
stats hide-version X - X X stats hide-version X - X X
@ -903,6 +898,7 @@ stats show-desc X - X X
stats show-legends X - X X stats show-legends X - X X
stats show-node X - X X stats show-node X - X X
stats uri X - X X stats uri X - X X
-- keyword -------------------------- defaults - frontend - listen -- backend -
stick match - - X X stick match - - X X
stick on - - X X stick on - - X X
stick store-request - - X X stick store-request - - X X
@ -912,18 +908,18 @@ tcp-request content reject - X X -
tcp-request inspect-delay - X X - tcp-request inspect-delay - X X -
timeout check X - X X timeout check X - X X
timeout client X X X - timeout client X X X -
timeout clitimeout X X X - (deprecated) timeout clitimeout (deprecated) X X X -
timeout connect X - X X timeout connect X - X X
timeout contimeout X - X X (deprecated) timeout contimeout (deprecated) X - X X
timeout http-keep-alive X X X X timeout http-keep-alive X X X X
timeout http-request X X X X timeout http-request X X X X
timeout queue X - X X timeout queue X - X X
timeout server X - X X timeout server X - X X
timeout srvtimeout X - X X (deprecated) timeout srvtimeout (deprecated) X - X X
timeout tarpit X X X X timeout tarpit X X X X
transparent X - X X (deprecated) transparent (deprecated) X - X X
use_backend - X X - use_backend - X X -
----------------------+----------+----------+---------+--------- ------------------------------------+----------+----------+---------+---------
keyword defaults frontend listen backend keyword defaults frontend listen backend