mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-28 22:31:06 +01:00
Code Issues Projects Releases Wiki Activity

MEDIUM: acme: rename "account" into "account-key"

Browse Source 
Rename the "account" option of the acme section into "account-key".
This commit is contained in:
William Lallemand 2025-04-24 11:06:39 +02:00
parent af73f98a3e
commit f192e446d6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/configuration.txt
View File

@ -5890,7 +5890,7 @@ The generation is not scheduled and must be triggered using the CLI command
The following keywords are usable in the ACME section: The following keywords are usable in the ACME section:
account <filename> account-key <filename>
Configure the path to the account key. The key need to be generated before Configure the path to the account key. The key need to be generated before
launching HAProxy. If no account keyword is used, the acme section will try launching HAProxy. If no account keyword is used, the acme section will try
to load a filename using the section name "<name>.account.key" to load a filename using the section name "<name>.account.key"
@ -5947,7 +5947,7 @@ Example:
acme LE1 acme LE1
directory https://acme-staging-v02.api.letsencrypt.org/directory directory https://acme-staging-v02.api.letsencrypt.org/directory
account /etc/haproxy/account.key account-key /etc/haproxy/letsencrypt.account.key
contact john.doe@example.com contact john.doe@example.com
challenge HTTP-01 challenge HTTP-01
keytype RSA keytype RSA
@ -5955,7 +5955,7 @@ Example:
acme LE2 acme LE2
directory https://acme-staging-v02.api.letsencrypt.org/directory directory https://acme-staging-v02.api.letsencrypt.org/directory
account /etc/haproxy/account.key account-key /etc/haproxy/letsencrypt.account.key
contact john.doe@example.com contact john.doe@example.com
challenge HTTP-01 challenge HTTP-01
keytype ECDSA keytype ECDSA

4
src/acme.c
View File

@ -273,7 +273,7 @@ static int cfg_parse_acme_kws(char **args, int section_type, struct proxy *curpx
ha_alert("parsing [%s:%d]: out of memory.\n", file, linenum); ha_alert("parsing [%s:%d]: out of memory.\n", file, linenum);
goto out; goto out;
} }
} else if (strcmp(args[0], "account") == 0) { } else if (strcmp(args[0], "account-key") == 0) {
/* save the filename of the account key */ /* save the filename of the account key */
if (!*args[1]) { if (!*args[1]) {
ha_alert("parsing [%s:%d]: keyword '%s' in '%s' section requires a filename argument\n", file, linenum, args[0], cursection); ha_alert("parsing [%s:%d]: keyword '%s' in '%s' section requires a filename argument\n", file, linenum, args[0], cursection);
@ -499,7 +499,7 @@ void deinit_acme()
static struct cfg_kw_list cfg_kws_acme = {ILH, { static struct cfg_kw_list cfg_kws_acme = {ILH, {
{ CFG_ACME, "directory", cfg_parse_acme_kws }, { CFG_ACME, "directory", cfg_parse_acme_kws },
{ CFG_ACME, "contact", cfg_parse_acme_kws }, { CFG_ACME, "contact", cfg_parse_acme_kws },
{ CFG_ACME, "account", cfg_parse_acme_kws }, { CFG_ACME, "account-key", cfg_parse_acme_kws },
{ CFG_ACME, "challenge", cfg_parse_acme_kws }, { CFG_ACME, "challenge", cfg_parse_acme_kws },
{ CFG_ACME, "keytype", cfg_parse_acme_cfg_key }, { CFG_ACME, "keytype", cfg_parse_acme_cfg_key },
{ CFG_ACME, "bits", cfg_parse_acme_cfg_key }, { CFG_ACME, "bits", cfg_parse_acme_cfg_key },