merchant

commit 5a7e69c09a008d84272ca61062523325f8a9d483
parent c1462d6bc63896940931696425d6c41a9798cfae
Author: Florian Dold <florian@dold.me>
Date:   Thu, 26 Aug 2021 16:22:19 +0200

use different, merchant-specific config file for overrides

Diffstat:
M
debian/changelog
 | 
6
++++++
M
debian/db/install/pgsql
 | 
4
++--

2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+taler-merchant (0.8.2-3) unstable; urgency=low
+
+  * Use separate config file for overrides.
+
+ -- Florian Dold <dold@taler.net>  Thu, 26 Aug 2021 16:21:06 +0200
+
 taler-merchant (0.8.2-2) unstable; urgency=low
 
   * Fixed syntax issue in database configuration script.
diff --git a/debian/db/install/pgsql b/debian/db/install/pgsql
@@ -1,14 +1,14 @@
 #!/bin/bash
 set -eu
 merchantdb_secretconf=/etc/taler/secrets/merchant-db.secret.conf
-merchantdb_overrideconf=/etc/taler/overrides.conf
+merchantdb_overrideconf=/etc/taler/conf.d/merchant-debconf.conf
 # get database settings from dbconfig-common and configure
 # for ADMINISTRATIVE access
 if [ -f /etc/dbconfig-common/taler-merchant.conf ]; then
     . /etc/dbconfig-common/taler-merchant.conf
     case "$dbc_dbtype" in
         pgsql)
-            echo -e "[merchant]\nDB=postgres\n\n" > \
+            echo -e "# Config file auto-generated by Debian.\n[merchant]\nDB=postgres\n\n" > \
               $merchantdb_overrideconf
             echo -e "[merchantdb-postgres]\nCONFIG=postgres:///${dbc_dbname}\n\n" > \
               $merchantdb_secretconf