mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 23:27:04 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: config: add HAPROXY_BRANCH environment variable

Browse Source 
This patch adds support from HAPROXY_BRANCH environment variable.
It can be useful is some resources are loaded from different
locations when migrating from one version to another.

Signed-off-by: Sbastien Gross <sgross@haproxy.com>
This commit is contained in:
Sbaastien Gross 2023-02-23 12:54:25 -05:00 committed by Willy Tarreau
parent a2a3d5dd25
commit 2a1bcf1a59
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/configuration.txt
View File

@ -782,6 +782,11 @@ file, or could be inherited by a program (See 3.7. Programs):
mode this is the version which was used to start the master, even after
updating the binary and reloading.
* HAPROXY_BRANCH: contains the HAProxy branch version (such as "2.8"). It does
not contain the full version number. It can be useful in case of migration
if resources (such as maps or certificates) are in a path containing the
branch number.
In addition, some pseudo-variables are internally resolved and may be used as
regular variables. Pseudo-variables always start with a dot ('.'), and are the
only ones where the dot is permitted. The current list of pseudo-variables is:

2
src/haproxy.c
View File

@ -2090,6 +2090,7 @@ static void init(int argc, char **argv)
setenv("HAPROXY_HTTP_LOG_FMT", default_http_log_format, 1);
setenv("HAPROXY_HTTPS_LOG_FMT", default_https_log_format, 1);
setenv("HAPROXY_TCP_LOG_FMT", default_tcp_log_format, 1);
setenv("HAPROXY_BRANCH", PRODUCT_BRANCH, 1);
list_for_each_entry(wl, &cfg_cfgfiles, list) {
int ret;
@ -2116,6 +2117,7 @@ static void init(int argc, char **argv)
}
}
/* remove temporary environment variables. */
unsetenv("HAPROXY_BRANCH");
unsetenv("HAPROXY_HTTP_LOG_FMT");
unsetenv("HAPROXY_HTTPS_LOG_FMT");
unsetenv("HAPROXY_TCP_LOG_FMT");