libeufin

commit 772d87d7969906ac14bc56791bddcc793a32dcf2
parent 1847ab4b459c7f57df7ba3d3fb7744c0515894bd
Author: Florian Dold <florian@dold.me>
Date:   Sun, 24 Sep 2023 22:47:13 +0200

config consistency with other components

Diffstat:
M
bank/src/main/kotlin/tech/libeufin/bank/Main.kt
 | 
4
++--
M
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
@@ -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
@@ -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