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

Rename the "account" option of the acme section into "account-key".

diff --git a/doc/configuration.txt b/doc/configuration.txt
index d50f9c83d32bdee54659faccc5b1ed048240e10f..fd0d89e63ba7edf82614a93e8de379440d34246d 100644 (file)
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -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:
 
-account <filename>
+account-key <filename>
   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
   to load a filename using the section name "<name>.account.key"
@@ -5947,7 +5947,7 @@ Example:
 
   acme LE1
       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
       challenge HTTP-01
       keytype RSA
@@ -5955,7 +5955,7 @@ Example:
 
   acme LE2
       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
       challenge HTTP-01
       keytype ECDSA

diff --git a/src/acme.c b/src/acme.c
index 8675877b590ca3cbe96a2f87b7ede3ae94ab2d4d..3a838320d491f90fe14e5807997aff5c0aa7b774 100644 (file)
--- a/src/acme.c
+++ b/src/acme.c
@@ -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);
                        goto out;
                }
-       } else if (strcmp(args[0], "account") == 0) {
+       } else if (strcmp(args[0], "account-key") == 0) {
                /* save the filename of the account key */
                if (!*args[1]) {
                        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, {
        { CFG_ACME, "directory",  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, "keytype",  cfg_parse_acme_cfg_key },
        { CFG_ACME, "bits",  cfg_parse_acme_cfg_key },