[taler-docs] 01/02: document new option (#6731)

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository docs.

commit 1c5fd285e514a202d421c500823e66181c0a51ac
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sun Jan 31 22:22:33 2021 +0100

    document new option (#6731)
---
 manpages/taler-merchant-httpd.1.rst | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/manpages/taler-merchant-httpd.1.rst 
b/manpages/taler-merchant-httpd.1.rst
index 1b2337a..126e845 100644
--- a/manpages/taler-merchant-httpd.1.rst
+++ b/manpages/taler-merchant-httpd.1.rst
@@ -32,6 +32,19 @@ before running this command.
 Options
 =======
 
+**-a** *TOKEN* \| **––auth=**\ \ *TOKEN*
+   Use TOKEN for initial access control to the merchant backend. The value
+   given in TOKEN must appear in backoffice requests to the default instance
+   of the merchant, i.e. "Authorization: secret-token:TOKEN" to obtain
+   access to the merchant backend.  Note that setting a passphrase for the
+   default instance by any means will block future access via TOKEN.  This
+   is basically a way to reset the passphrase protecting access.  TOKEN
+   should be a "pchar" as per RFC 8959, but this is NOT checked.  Note that
+   TOKEN will only grant access to the 'default' instance, not other instances.
+   Instead of using the command-line, which exposes TOKEN to users on the
+   system, you may want to consider setting the
+   TALER_MERCHANT_TOKEN environment variable instead.
+
 **-C** \| **––connection-close**
    Force each HTTP connection to be closed after each request
    (useful in combination with -f to avoid having to wait for nc to
@@ -68,6 +81,14 @@ SIGTERM
        cleanly.
 
 
+Environment Variables
+=====================
+
+TALER_MERCHANT_TOKEN
+       Like the "-a" option, resets the access token for the default
+       instance to the given value.
+
+
 See Also
 ========
 

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.