[taler-docs] branch master updated (caa71e0 -> b55d534)

[gnunet]

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

grothoff pushed a change to branch master
in repository docs.

    from caa71e0  expand API spec to deal with #6731
     new 1c5fd28  document new option (#6731)
     new b55d534  document auth details in #6731

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 core/api-merchant.rst               | 12 +++++++++++-
 manpages/taler-merchant-httpd.1.rst | 21 +++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/core/api-merchant.rst b/core/api-merchant.rst
index 0dbf7b0..7d7a784 100644
--- a/core/api-merchant.rst
+++ b/core/api-merchant.rst
@@ -865,7 +865,10 @@ Setting up instances
 
 .. http:patch:: /private/instances/$INSTANCE
 
-  Update the configuration of a merchant instance.
+  Update the configuration of a merchant instance.  PATCH operations against
+  an instance are authenticated by checking that an authorization is provided
+  that matches either the credential required by the instance being modified
+  OR the 'default' instance.
 
   **Request**
 
@@ -1058,6 +1061,10 @@ Deleting instances
   while disabling (the default) only deletes the private key
   and makes the instance unusable for new orders or payments.
 
+  For deletion, the authentication credentials must match
+  the instance that is being deleted or the 'default'
+  instance.
+
   **Request:**
 
   :query purge: *Optional*. If set to YES, the instance will be fully
@@ -1067,6 +1074,9 @@ Deleting instances
 
   :http:statuscode:`204 No content`:
     The backend has successfully removed the instance.  The body is empty.
+  :http:statuscode:`401 Unauthorized`:
+    The request is unauthorized. Note that for already deleted instances,
+    the request must be authorized using the 'default' instance.
   :http:statuscode:`404 Not found`:
     The instance is unknown to the backend.
   :http:statuscode:`409 Conflict`:
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.