[taler-merchant] branch master updated: use sane default for DB name

[gnunet]

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

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new fd7826ae use sane default for DB name
fd7826ae is described below

commit fd7826ae9a201a4c1889ba7526ab4f29f68d1d82
Author: Christian Grothoff <grothoff@gnunet.org>
AuthorDate: Fri Dec 15 16:36:45 2023 +0800

    use sane default for DB name
---
 contrib/taler-merchant-dbconfig                  | 2 +-
 debian/etc/taler/secrets/merchant-db.secret.conf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/taler-merchant-dbconfig b/contrib/taler-merchant-dbconfig
index fad84747..db9e38c4 100755
--- a/contrib/taler-merchant-dbconfig
+++ b/contrib/taler-merchant-dbconfig
@@ -22,7 +22,7 @@ set -eu
 RESET_DB=0
 SKIP_DBINIT=0
 DBUSER="taler-merchant-httpd"
-CFGFILE="/etc/taler/secrets/merchant-db.secret.conf"
+CFGFILE="/etc/taler/taler.conf"
 
 # Parse command-line options
 while getopts 'c:hrsu:' OPTION; do
diff --git a/debian/etc/taler/secrets/merchant-db.secret.conf 
b/debian/etc/taler/secrets/merchant-db.secret.conf
index 85bf6d3e..6cbbb24c 100644
--- a/debian/etc/taler/secrets/merchant-db.secret.conf
+++ b/debian/etc/taler/secrets/merchant-db.secret.conf
@@ -2,7 +2,7 @@
 
 # Typically, there should only be a single line here, of the form:
 
-CONFIG=postgres:///DATABASE
+CONFIG=postgres:///taler-merchant
 
 # The details of the URI depend on where the database lives and how
 # access control was configured.

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