diff options
| author | Antoine A <> | 2024-02-06 15:10:38 +0100 |
|---|---|---|
| committer | Antoine A <> | 2024-02-06 15:10:38 +0100 |
| commit | 2f4ac08b02f763a941d1ee0154ff6e2ed5b9c024 (patch) | |
| tree | 9857d3bf85978801b9fbb8e780f8a8a56f1fca28 | |
| parent | cbdb013d76bf404930055eabc85165a870318a3a (diff) | |
| download | libeufin-2f4ac08b02f763a941d1ee0154ff6e2ed5b9c024.tar.gz libeufin-2f4ac08b02f763a941d1ee0154ff6e2ed5b9c024.tar.bz2 libeufin-2f4ac08b02f763a941d1ee0154ff6e2ed5b9c024.zip | |
Use libeufin-nexus-postgres for libeufin-nexus db config
| -rw-r--r-- | contrib/nexus.conf | 7 | ||||
| -rw-r--r-- | nexus/conf/test.conf | 2 | ||||
| -rw-r--r-- | nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt | 2 | ||||
| -rw-r--r-- | testbench/conf/integration.conf | 2 | ||||
| -rw-r--r-- | testbench/conf/mini.conf | 3 | ||||
| -rw-r--r-- | testbench/src/main/kotlin/Main.kt | 2 |
6 files changed, 11 insertions, 7 deletions
diff --git a/contrib/nexus.conf b/contrib/nexus.conf index 58caad34..3854ad55 100644 --- a/contrib/nexus.conf +++ b/contrib/nexus.conf @@ -35,12 +35,13 @@ CLIENT_PRIVATE_KEYS_FILE = ${LIBEUFIN_NEXUS_HOME}/client-ebics-keys.json # Typically, it is named after the bank itself. BANK_DIALECT = postfinance -[nexus-postgres] -CONFIG = postgres:///libeufin - [libeufin-nexusdb-postgres] +# Where are the SQL files to setup our tables? SQL_DIR = $DATADIR/sql/ +# DB connection string +CONFIG = postgres:///libeufin + [nexus-fetch] FREQUENCY = 30m diff --git a/nexus/conf/test.conf b/nexus/conf/test.conf index 0235dde1..db408af1 100644 --- a/nexus/conf/test.conf +++ b/nexus/conf/test.conf @@ -9,5 +9,5 @@ HOST_ID = PFEBICS USER_ID = PFC00563 PARTNER_ID = PFC00563 -[nexus-postgres] +[libeufin-nexusdb-postgres] CONFIG = postgres:///libeufincheck
\ No newline at end of file diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt index d4fd1a99..55d44734 100644 --- a/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt +++ b/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt @@ -209,7 +209,7 @@ fun loadConfig(configFile: Path?): TalerConfig = NEXUS_CONFIG_SOURCE.fromFile(co */ fun TalerConfig.dbConfig(): DatabaseConfig = DatabaseConfig( - dbConnStr = requireString("nexus-postgres", "config"), + dbConnStr = lookupString("libeufin-nexusdb-postgres", "config") ?: requireString("nexus-postgres", "config"), sqlDir = requirePath("libeufin-nexusdb-postgres", "sql_dir") ) diff --git a/testbench/conf/integration.conf b/testbench/conf/integration.conf index 39056996..29e7ccf4 100644 --- a/testbench/conf/integration.conf +++ b/testbench/conf/integration.conf @@ -13,5 +13,5 @@ CONFIG = postgresql:///libeufincheck [nexus-ebics] currency = EUR -[nexus-postgres] +[libeufin-bankdb-postgres] CONFIG = postgres:///libeufincheck diff --git a/testbench/conf/mini.conf b/testbench/conf/mini.conf index 5244dae2..4c5e3a10 100644 --- a/testbench/conf/mini.conf +++ b/testbench/conf/mini.conf @@ -1,2 +1,5 @@ [libeufin-bankdb-postgres] +CONFIG = postgresql:///libeufincheck + +[libeufin-nexusdb-postgres] CONFIG = postgresql:///libeufincheck
\ No newline at end of file diff --git a/testbench/src/main/kotlin/Main.kt b/testbench/src/main/kotlin/Main.kt index de98d2ab..a92e7ad4 100644 --- a/testbench/src/main/kotlin/Main.kt +++ b/testbench/src/main/kotlin/Main.kt @@ -92,7 +92,7 @@ class Cli : CliktCommand("Run integration tests on banks provider") { [nexus-submit] FREQUENCY = 5s - [nexus-postgres] + [libeufin-nexusdb-postgres] CONFIG = postgres:///libeufincheck """) val cfg = loadConfig(conf) |