commit 5df5885aaa23991483c4b1ada0cfef93631ee20f
parent fc5e88bfc1796cecdccbc73e68f7353af07281c2
Author: Christian Grothoff <grothoff@gnunet.org>
Date: Tue, 17 Feb 2026 21:46:58 +0100
fix #10973
Diffstat:
3 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/debian/etc/taler-merchant/conf.d/merchant.conf b/debian/etc/taler-merchant/conf.d/merchant.conf
@@ -3,8 +3,5 @@
@inline-secret@ merchantdb-postgres ../secrets/merchant-db.secret.conf
[merchant]
-DATABASE = postgres
-SERVE = unix
+SERVE = systemd
-# Merchant-specific overrides, included last to take precedence.
-@inline-matching@ ../merchant-overrides.conf
diff --git a/debian/etc/taler-merchant/taler-merchant.conf b/debian/etc/taler-merchant/taler-merchant.conf
@@ -19,12 +19,6 @@
# can read it. All files in it should end with
# ".secret.conf".
-# Inline configurations from all Taler components.
-@inline-matching@ conf.d/*.conf
-
-# Overrides from tools that help with configuration.
-@inline@ overrides.conf
-
[paths]
# Paths for the system-wide installation of the Taler merchant. Do not remove
@@ -35,3 +29,13 @@ TALER_RUNTIME_DIR = /run/taler-merchant/
TALER_CACHE_HOME = /var/cache/taler-merchant/
TALER_CONFIG_HOME = /etc/taler-merchant/
TALER_DATA_HOME = /var/lib/taler-merchant/
+
+# Inline configurations from drop-in configuration files.
+@inline-matching@ conf.d/*.conf
+
+# Overrides from tools that help with configuration.
+@inline@ overrides.conf
+
+# Optional, manual overrides, included last to take precedence.
+# Use drop-in files in conf.d/ if possible.
+@inline-matching@ merchant-overrides.conf
diff --git a/src/backend/taler-merchant-httpd_private-get-orders-ID.c b/src/backend/taler-merchant-httpd_private-get-orders-ID.c
@@ -1021,16 +1021,6 @@ phase_check_repurchase (struct GetOrderRequestContext *gorc)
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Found already paid order %s\n",
already_paid_order_id);
- // FIXME-#10966 (discuss with Florian): it is a bit wild that we use the session ID of the *client's request*
- // (which we usually use to check that the right session got paid!) here to
- // construct the payment URI when we actually _also_ have a session_id in the
- // orders table! CG thinks we probably should change this and *ignore* the
- // client's session ID and when building the taler://pay/ URI only use the
- // session ID of the order's table (is that one even used right now?).
- // Right now, test_merchant_templates.sh has to pass the PAIVANA_ID when
- // calling this endpoint, otherwise the taler://pay/-URI would have no
- // session ID, despite the templating mechanism having set one explicitly
- // when instantiating the order.
taler_pay_uri = TMH_make_taler_pay_uri (gorc->sc.con,
hc->infix,
gorc->session_id,
