[libeufin] branch master updated: config consistency with other components

[gnunet]

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

dold pushed a commit to branch master
in repository libeufin.

The following commit(s) were added to refs/heads/master by this push:
     new 772d87d7 config consistency with other components
772d87d7 is described below

commit 772d87d7969906ac14bc56791bddcc793a32dcf2
Author: Florian Dold <florian@dold.me>
AuthorDate: Sun Sep 24 22:47:13 2023 +0200

    config consistency with other components
---
 bank/src/main/kotlin/tech/libeufin/bank/Main.kt | 4 ++--
 contrib/libeufin-bank.conf                      | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bank/src/main/kotlin/tech/libeufin/bank/Main.kt 
b/bank/src/main/kotlin/tech/libeufin/bank/Main.kt
index 53a2df43..67cf4c4d 100644
--- a/bank/src/main/kotlin/tech/libeufin/bank/Main.kt
+++ b/bank/src/main/kotlin/tech/libeufin/bank/Main.kt
@@ -400,7 +400,7 @@ class BankDbInit : CliktCommand("Initialize the 
libeufin-bank database", name =
 
     override fun run() {
         val config = TalerConfig.load(this.configFile)
-        val dbConnStr = config.requireValueString("libeufin-bankdb", "config")
+        val dbConnStr = config.requireValueString("libeufin-bankdb-postgres", 
"config")
         val sqlDir = config.requireValuePath("libeufin-bankdb-postgres", 
"sql_dir")
         if (requestReset) {
             resetDatabaseTables(dbConnStr, sqlDir)
@@ -423,7 +423,7 @@ class ServeBank : CliktCommand("Run libeufin-bank HTTP 
server", name = "serve")
     override fun run() {
         val config = TalerConfig.load(this.configFile)
         val ctx = readBankApplicationContextFromConfig(config)
-        val dbConnStr = config.requireValueString("libeufin-bankdb", "config")
+        val dbConnStr = config.requireValueString("libeufin-bankdb-postgres", 
"config")
         logger.info("using database '$dbConnStr'")
         val serveMethod = config.requireValueString("libeufin-bank", "serve")
         if (serveMethod.lowercase() != "tcp") {
diff --git a/contrib/libeufin-bank.conf b/contrib/libeufin-bank.conf
index 3d84c20e..935f3825 100644
--- a/contrib/libeufin-bank.conf
+++ b/contrib/libeufin-bank.conf
@@ -10,9 +10,9 @@ SPA_CAPTCHA_URL = http://bank.spa/#/operation/{woip}
 SERVE = tcp
 PORT = 8080
 
-[libeufin-bankdb]
-CONFIG = postgresql:///libeufinbank
-
 [libeufin-bankdb-postgres]
 # Where are the SQL files to setup our tables?
 SQL_DIR = $DATADIR/sql/libeufin-bank/
+
+# DB connection string
+CONFIG = postgresql:///libeufinbank

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