[taler-merchant] branch master updated: use different, merchant-specific config file for overrides

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 5a7e69c0 use different, merchant-specific config file for overrides
5a7e69c0 is described below

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

    use different, merchant-specific config file for overrides
---
 contrib/merchant-backoffice | 2 +-
 debian/changelog            | 6 ++++++
 debian/db/install/pgsql     | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/contrib/merchant-backoffice b/contrib/merchant-backoffice
index 03c8c9b7..4320467d 160000
--- a/contrib/merchant-backoffice
+++ b/contrib/merchant-backoffice
@@ -1 +1 @@
-Subproject commit 03c8c9b794905878175d07366267bdc01c3795b9
+Subproject commit 4320467db1392e5f48a4acd079f7e2a253cf9984
diff --git a/debian/changelog b/debian/changelog
index cafc755d..8edec8d1 100644
--- 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
index 7a960471..67b030c0 100755
--- 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

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.