aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian@dold.me>2021-08-26 16:28:02 +0200
committerFlorian Dold <florian@dold.me>2021-08-26 16:28:02 +0200
commit21ec352775a5ae5f5def24232222dd56acf42eae (patch)
tree8ad342c9a7d8705bc21d6e3f99129d9f4ee01cb0
parent5a7e69c09a008d84272ca61062523325f8a9d483 (diff)
downloadmerchant-21ec352775a5ae5f5def24232222dd56acf42eae.tar.gz
merchant-21ec352775a5ae5f5def24232222dd56acf42eae.tar.bz2
merchant-21ec352775a5ae5f5def24232222dd56acf42eae.zip
give overrides precedence
-rwxr-xr-xdebian/db/install/pgsql2
-rw-r--r--debian/etc/taler/conf.d/merchant.conf3
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/db/install/pgsql b/debian/db/install/pgsql
index 67b030c0..04d5a6ed 100755
--- 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
index b89751c3..41816b0b 100644
--- 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