commit f38d7fab2ead4c5cc973b51771bb503a15f9ee9f
parent c2bba221c321530e0f52ae2d6cc448c935a15971
Author: Christian Grothoff <christian@grothoff.org>
Date: Fri, 6 Feb 2026 20:59:42 +0100
more details on phone_regex for #10981
Diffstat:
2 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/core/api-merchant.rst b/core/api-merchant.rst
@@ -247,8 +247,9 @@ such as the implemented version of the protocol and the currency used.
// Posix regular expression for allowed phone numbers;
// applies when creating or patching an instance.
+ // Optional, can be NULL for no restrictions.
// Since **v26**.
- phone_regex: string;
+ phone_regex?: string;
// Array of exchanges trusted by the merchant.
// @since **v6**.
@@ -5182,7 +5183,7 @@ Querying expected wire transfers
:http:statuscode:`409 Conflict`:
The exchange did not yet provide the transaction details
(the ``last_http_status`` of the `ExpectedTransferDetails` is
- not 200). The information may be available later but is not yet.
+ not 200). The information may be available later but is not yet.
**Details:**
diff --git a/manpages/taler-merchant.conf.5.rst b/manpages/taler-merchant.conf.5.rst
@@ -1,6 +1,6 @@
..
This file is part of GNU TALER.
- Copyright (C) 2014-2024 Taler Systems SA
+ Copyright (C) 2014-2026 Taler Systems SA
TALER is free software; you can redistribute it and/or modify it under the
terms of the GNU Affero General Public License as published by the Free Software
@@ -166,13 +166,25 @@ ENABLE_SELF_PROVISIONING
Set to YES to allow unauthenticated clients to create new instances.
MANDATORY_TAN_CHANNELS
- Space-separted list of TAN channels required for password reset. Can be "sms" or "email" or both.
+ Space-separted list of TAN channels required for password reset.
+ Can be "sms" or "email" or both.
+
+PHONE_REGEX
+ Posix regular expression specifying which phone numbers are acceptable for
+ the instances. Useful to restrict phone numbers to those that work
+ with the ``HELPER_SMS``. Optional, if missing no restrictions apply.
HELPER_SMS
- Helper binary to use to send SMS. Will get the SMS phone number as the only command-line argument, and the message to send as the body. Optional, if missing "sms" will not work as a TAN channel.
+ Helper binary to use to send SMS.
+ Will get the SMS phone number as the only command-line argument,
+ and the message to send as the body.
+ Optional, if missing "sms" will not work as a TAN channel.
HELPER_EMAIL
- Helper binary to use to send e-mail. Will get the e-mail address as the only command-line argument, and the message to send as the body. Optional, if missing "email" will not work as a TAN channel.
+ Helper binary to use to send e-mail.
+ Will get the e-mail address as the only command-line argument,
+ and the message to send as the body.
+ Optional, if missing "email" will not work as a TAN channel.
STRICT_PROTOCOL_V19
Set to YES to strictly enforce protocol version 19 or later. Transient option for development.
