merchant

commit 21ec352775a5ae5f5def24232222dd56acf42eae
parent 5a7e69c09a008d84272ca61062523325f8a9d483
Author: Florian Dold <florian@dold.me>
Date:   Thu, 26 Aug 2021 16:28:02 +0200

give overrides precedence

Diffstat:
M
debian/db/install/pgsql
 | 
2
+-
M
debian/etc/taler/conf.d/merchant.conf
 | 
3
+++

2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/debian/db/install/pgsql b/debian/db/install/pgsql
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -eu
 merchantdb_secretconf=/etc/taler/secrets/merchant-db.secret.conf
-merchantdb_overrideconf=/etc/taler/conf.d/merchant-debconf.conf
+merchantdb_overrideconf=/etc/taler/merchant-overrides.conf
 # get database settings from dbconfig-common and configure
 # for ADMINISTRATIVE access
 if [ -f /etc/dbconfig-common/taler-merchant.conf ]; then
diff --git a/debian/etc/taler/conf.d/merchant.conf b/debian/etc/taler/conf.d/merchant.conf
@@ -4,3 +4,6 @@
 
 [merchant]
 DATABASE = postgres
+
+# Merchant-specific overrides, included last to take precedence.
+@inline-matching@ ../merchant-overrides.conf