Skip to content

Commit 311dc74

Browse files
committed
DOC: config: indent the list of environment variables
In the doc our lists are indented but for any reason this one was not, making it harder to visually delimit. Let's just indent it. No need to backport this, it's totally cosmetic and would need adaptations since it was recently touched.
1 parent 41d906d commit 311dc74

File tree

1 file changed

+39
-39
lines changed

1 file changed

+39
-39
lines changed

doc/configuration.txt

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,64 +1007,64 @@ modes:
10071007

10081008
The variables in question are the following:
10091009

1010-
* HAPROXY_LOCALPEER: defined at the startup of the process which contains the
1011-
name of the local peer. (See "-L" in the management guide.)
1010+
* HAPROXY_LOCALPEER: defined at the startup of the process which contains the
1011+
name of the local peer. (See "-L" in the management guide.)
10121012

1013-
* HAPROXY_CFGFILES: list of the configuration files loaded by HAProxy,
1014-
separated by semicolons. Can be useful in the case you specified a
1015-
directory.
1013+
* HAPROXY_CFGFILES: list of the configuration files loaded by HAProxy,
1014+
separated by semicolons. Can be useful in the case you specified a
1015+
directory.
10161016

1017-
* HAPROXY_HTTP_LOG_FMT: contains the value of the default HTTP log format as
1018-
defined in section 8.2.3 "HTTP log format". It can be used to override the
1019-
default log format without having to copy the whole original definition.
1017+
* HAPROXY_HTTP_LOG_FMT: contains the value of the default HTTP log format as
1018+
defined in section 8.2.3 "HTTP log format". It can be used to override the
1019+
default log format without having to copy the whole original definition.
10201020

1021-
* HAPROXY_HTTP_CLF_LOG_FMT: contains the value of the default HTTP CLF log
1022-
format as defined in section 8.2.3 "HTTP log format". It can be used to
1023-
override the default log format without having to copy the whole original
1024-
definition.
1021+
* HAPROXY_HTTP_CLF_LOG_FMT: contains the value of the default HTTP CLF log
1022+
format as defined in section 8.2.3 "HTTP log format". It can be used to
1023+
override the default log format without having to copy the whole original
1024+
definition.
10251025

1026-
Example:
1027-
# Add the rule that gave the final verdict to the log
1028-
log-format "${HAPROXY_TCP_LOG_FMT} lr=last_rule_file:last_rule_line"
1026+
Example:
1027+
# Add the rule that gave the final verdict to the log
1028+
log-format "${HAPROXY_TCP_LOG_FMT} lr=last_rule_file:last_rule_line"
10291029

1030-
* HAPROXY_HTTPS_LOG_FMT: similar to HAPROXY_HTTP_LOG_FMT but for HTTPS log
1031-
format as defined in section 8.2.4 "HTTPS log format".
1030+
* HAPROXY_HTTPS_LOG_FMT: similar to HAPROXY_HTTP_LOG_FMT but for HTTPS log
1031+
format as defined in section 8.2.4 "HTTPS log format".
10321032

1033-
* HAPROXY_TCP_LOG_FMT: similar to HAPROXY_HTTP_LOG_FMT but for TCP log format
1034-
as defined in section 8.2.2 "TCP log format".
1033+
* HAPROXY_TCP_LOG_FMT: similar to HAPROXY_HTTP_LOG_FMT but for TCP log format
1034+
as defined in section 8.2.2 "TCP log format".
10351035

1036-
* HAPROXY_TCP_CLF_LOG_FMT: similar to HAPROXY_HTTP_CLF_LOG_FMT but for TCP CLF
1037-
log format as defined in section 8.2.2 "TCP log format".
1036+
* HAPROXY_TCP_CLF_LOG_FMT: similar to HAPROXY_HTTP_CLF_LOG_FMT but for TCP
1037+
CLF log format as defined in section 8.2.2 "TCP log format".
10381038

1039-
* HAPROXY_MWORKER: In master-worker mode, this variable is set to 1.
1039+
* HAPROXY_MWORKER: In master-worker mode, this variable is set to 1.
10401040

1041-
* HAPROXY_CLI: configured listeners addresses of the stats socket of every
1042-
processe, these addresses are separated by semicolons.
1041+
* HAPROXY_CLI: configured listeners addresses of the stats socket of every
1042+
processe, these addresses are separated by semicolons.
10431043

1044-
* HAPROXY_MASTER_CLI: In master-worker mode, listeners addresses of the master
1045-
CLI, separated by semicolons.
1044+
* HAPROXY_MASTER_CLI: In master-worker mode, listeners addresses of the master
1045+
CLI, separated by semicolons.
10461046

1047-
* HAPROXY_STARTUP_VERSION: contains the version used to start, in master-worker
1048-
mode this is the version which was used to start the master, even after
1049-
updating the binary and reloading.
1047+
* HAPROXY_STARTUP_VERSION: contains the version used to start, in master-
1048+
worker mode this is the version which was used to start the master, even
1049+
after updating the binary and reloading.
10501050

1051-
* HAPROXY_BRANCH: contains the HAProxy branch version (such as "2.8"). It does
1052-
not contain the full version number. It can be useful in case of migration
1053-
if resources (such as maps or certificates) are in a path containing the
1054-
branch number.
1051+
* HAPROXY_BRANCH: contains the HAProxy branch version (such as "2.8"). It
1052+
does not contain the full version number. It can be useful in case of
1053+
migration if resources (such as maps or certificates) are in a path
1054+
containing the branch number.
10551055

10561056
In addition, some pseudo-variables are internally resolved and may be used as
10571057
regular variables. Pseudo-variables always start with a dot ('.'), and are the
10581058
only ones where the dot is permitted. The current list of pseudo-variables is:
10591059

1060-
* .FILE: the name of the configuration file currently being parsed.
1060+
* .FILE: the name of the configuration file currently being parsed.
10611061

1062-
* .LINE: the line number of the configuration file currently being parsed,
1063-
starting at one.
1062+
* .LINE: the line number of the configuration file currently being parsed,
1063+
starting at one.
10641064

1065-
* .SECTION: the name of the section currently being parsed, or its type if the
1066-
section doesn't have a name (e.g. "global"), or an empty string before the
1067-
first section.
1065+
* .SECTION: the name of the section currently being parsed, or its type if
1066+
the section doesn't have a name (e.g. "global"), or an empty string before
1067+
the first section.
10681068

10691069
These variables are resolved at the location where they are parsed. For example
10701070
if a ".LINE" variable is used in a "log-format" directive located in a defaults

0 commit comments

Comments
 (0)