commit e63b013bb8b0c4d4d7d0306258b09124f00f8bb8
parent 31a2428374c048fc200df41e08b4eddf3462a9a4
Author: Christian Grothoff <grothoff@gnunet.org>
Date: Thu, 23 Oct 2025 17:02:26 +0200
update docs for #10025-fix
Diffstat:
2 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/manpages/taler-merchant-passwd.1.rst b/manpages/taler-merchant-passwd.1.rst
@@ -6,7 +6,7 @@ taler-merchant-passwd(1)
Name
====
- **taler-merchant-passwd** - reset password of existing instance
+ **taler-merchant-passwd** - reset password of existing instance and/or create admin instance
Synopsis
@@ -29,6 +29,11 @@ of existing Taler instances. The password must either be specified
as the last command-line argument or in the TALER_MERCHANT_PASSWORD
environment variable.
+Usually, the instance for which the password is being set must
+already exist. However, as a special exception, if the instance
+specified is the "admin" instance, then it is created (with
+sensible defaults) if it does not yet exist.
+
Its options are as follows:
**-c** *FILENAME* \| **--config=**\ \ *FILENAME*
@@ -40,7 +45,7 @@ Its options are as follows:
**-i** *NAME* \| **--instance**\ \ *NAME*
Specifies the name of the instance for which the password should be
- updated. If not given, the "default" instance is modified.
+ updated. If not given, the "admin" instance is modified.
**-L** *LOGLEVEL* \| **--loglevel=**\ \ *LOGLEVEL*
Specifies the log level to use. Accepted values are: ``DEBUG``, ``INFO``,
diff --git a/taler-merchant-manual.rst b/taler-merchant-manual.rst
@@ -825,9 +825,17 @@ interface. Alternatively, you can also use the ``wget`` commands given below.
Regardless of which approach you use, the first step for using the backend
involves the creation of the ``admin`` instance. The ``admin`` instance can
also create, configure or delete other instances, similar to the ``root``
-account on UNIX. When no instance exists and ``taler-merchant-httpd`` was
-started without the ``--auth`` option, then the backend is reachable without
-any access control (unless you configured some in the reverse proxy).
+account on UNIX. When no instance exists, then the backend is reachable
+without any access control (unless you configured some in the reverse proxy).
+
+.. note::
+
+ If you created a non-admin instance first, you cannot create an ``admin``
+ instance via the SPA anymore. In this case, you can only create an
+ administrative account by using the command-line. By invoking
+ ``taler-merchant-passwd --instance=admin $PASSWORD`` you can set both the
+ password and create an ``admin`` instance if it does not yet exist.
+ However, for non-admin instances, you can only set the password with this tool.
The following documentation shows how to handle any instance. Thus, if you
want to have multiple instances, you may need to perform the steps multiple
