summaryrefslogtreecommitdiff
path: root/manpages
diff options
context:
space:
mode:
authorChristian Grothoff <grothoff@gnunet.org>2022-11-29 10:59:19 +0100
committerChristian Grothoff <grothoff@gnunet.org>2022-11-29 10:59:19 +0100
commitc2ce023b620b8c23ad94942d98c5752082de534a (patch)
treed1987a40091ac50cbbeb7f0c3755450e6729c8e6 /manpages
parentdfee7a299cdbaa6f1159d20dc6bf2927f9c12c2d (diff)
downloaddocs-master.tar.gz
docs-master.tar.bz2
docs-master.zip
fix #7499HEADmaster
Diffstat (limited to 'manpages')
-rw-r--r--manpages/taler-merchant-httpd.1.rst5
-rw-r--r--manpages/taler.conf.5.rst4
2 files changed, 7 insertions, 2 deletions
diff --git a/manpages/taler-merchant-httpd.1.rst b/manpages/taler-merchant-httpd.1.rst
index 5ea47c1..cf9192f 100644
--- a/manpages/taler-merchant-httpd.1.rst
+++ b/manpages/taler-merchant-httpd.1.rst
@@ -13,6 +13,7 @@ Synopsis
========
**taler-merchant-httpd**
+[**-a**_|_**--auth**]
[**-C** | **--connection-close**]
[**-c** *FILENAME* | **--config=**\ \ *FILENAME*]
[**-h** | **--help**]
@@ -33,9 +34,9 @@ Options
=======
**-a** *TOKEN* \| **--auth=**\ \ *TOKEN*
- Use TOKEN for initial access control to the merchant backend. The value
+ Use TOKEN for initial access control to the merchant backend. TOKEN must start with the "secret-token:" prefix, as per RFC 8959. The value
given in TOKEN must appear in backoffice requests to the default instance
- of the merchant, i.e. "Authorization: Bearer secret-token:TOKEN" to obtain
+ of the merchant, i.e. "Authorization: Bearer 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
diff --git a/manpages/taler.conf.5.rst b/manpages/taler.conf.5.rst
index 510fd87..1c70879 100644
--- a/manpages/taler.conf.5.rst
+++ b/manpages/taler.conf.5.rst
@@ -340,6 +340,10 @@ AGGREGATOR_SHIFT
Delay between a deposit being eligible for aggregation and
the aggregator actually triggering.
+DEFAULT_PURSE_LIMIT
+ Number of concurrent purses that a reserve may have active
+ if it is paid to be opened for a year.
+
EXCHANGE POSTGRES BACKEND DATABASE OPTIONS
------------------------------------------