exchange

commit 118b707dfce251e9920d1b26f886fda6d07ca486
parent ff8c2cdf060714c4e5b36bd1c6a44b1781a62dc8
Author: Christian Grothoff <christian@grothoff.org>
Date:   Mon,  2 Dec 2024 08:58:39 +0100

fix data dir

Diffstat:
M
src/auditor/batch.conf
 | 
2
+-
M
src/auditor/generate-auditor-basedb.conf
 | 
11
+++++------
M
src/auditor/revoke-basedb.conf
 | 
2
+-
M
src/auditor/test-sync-in.conf
 | 
7
++-----
M
src/auditor/test-sync-out.conf
 | 
7
++-----

5 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/src/auditor/batch.conf b/src/auditor/batch.conf
@@ -132,7 +132,7 @@ PAYTO_URI = payto://x-taler-bank/localhost/exchange
 NAME = Merchant Inc.
 KEYFILE = ${TALER_DATA_HOME}/merchant/default.priv
 
-[taler]
+[exchange]
 CURRENCY_ROUND_UNIT = TESTKUDOS:0.01
 CURRENCY = TESTKUDOS
 
diff --git a/src/auditor/generate-auditor-basedb.conf b/src/auditor/generate-auditor-basedb.conf
@@ -3,11 +3,10 @@ TALER_CACHE_HOME = $TALER_HOME/.cache/taler/
 TALER_CONFIG_HOME = $TALER_HOME/.config/taler/
 TALER_DATA_HOME = $TALER_HOME/.local/share/taler/
 TALER_HOME = ${PWD}/generate_auditordb_home/
-[taler]
-CURRENCY = TESTKUDOS
-CURRENCY_ROUND_UNIT = TESTKUDOS:0.01
 
 [exchange]
+CURRENCY = TESTKUDOS
+CURRENCY_ROUND_UNIT = TESTKUDOS:0.01
 MASTER_PUBLIC_KEY = M4FGP18EQFXFGGFQ1AWXHACN2JX0SMVK9CNF6459Z1WG18JSN0BG
 SIGNKEY_DURATION = 4 weeks
 LOOKAHEAD_SIGN = 32 weeks 1 day
@@ -44,7 +43,7 @@ CONFIG = postgresql:///auditor-basedb
 
 [exchangedb-postgres]
 CONFIG = postgres:///auditor-basedb
-SQL_DIR = $DATADIR/sql/exchange/
+SQL_DIR = ${DATADIR}sql/
 IDLE_RESERVE_EXPIRATION_TIME = 4 weeks
 LEGAL_RESERVE_EXPIRATION_TIME = 4 weeks
 
@@ -66,7 +65,7 @@ PORT = 8888
 
 [merchantdb-postgres]
 CONFIG = postgres:///auditor-basedb
-SQL_DIR = $DATADIR/sql/merchant/
+SQL_DIR = ${DATADIR}sql/
 
 [merchant-exchange-default]
 MASTER_KEY = M4FGP18EQFXFGGFQ1AWXHACN2JX0SMVK9CNF6459Z1WG18JSN0BG
@@ -103,7 +102,7 @@ TALER_AUDITOR_SALT=64S36D1N6RVKGC9J6CT3ADHQ70RK4CSM6MV3EE1H68SK8D9P6WW32CHK6GTKC
 
 [auditordb-postgres]
 CONFIG = postgres:///auditor-basedb
-SQL_DIR = $DATADIR/sql/auditor/
+SQL_DIR = ${DATADIR}sql/
 
 [coin_kudos_ct_1]
 value = TESTKUDOS:0.01
diff --git a/src/auditor/revoke-basedb.conf b/src/auditor/revoke-basedb.conf
@@ -23,7 +23,7 @@ CONFIG = postgres:///revoke-basedb
 [exchangedb-postgres]
 CONFIG = postgres:///revoke-basedb
 
-[taler]
+[exchange]
 CURRENCY = TESTKUDOS
 CURRENCY_ROUND_UNIT = TESTKUDOS:0.01
 
diff --git a/src/auditor/test-sync-in.conf b/src/auditor/test-sync-in.conf
@@ -1,6 +1,7 @@
 [exchange]
 #The DB plugin to use
 DB = postgres
+CURRENCY = EUR
 
 [exchangedb-postgres]
 
@@ -8,11 +9,7 @@ DB = postgres
 CONFIG = postgres:///talercheck-in
 
 # Where are the SQL files to setup our tables?
-SQL_DIR = $DATADIR/sql/exchange/
-
-
-[taler]
-CURRENCY = EUR
+SQL_DIR = ${DATADIR}sql/
 
 [exchangedb]
 
diff --git a/src/auditor/test-sync-out.conf b/src/auditor/test-sync-out.conf
@@ -1,6 +1,7 @@
 [exchange]
 #The DB plugin to use
 DB = postgres
+CURRENCY = EUR
 
 [exchangedb-postgres]
 
@@ -8,11 +9,7 @@ DB = postgres
 CONFIG = postgres:///talercheck-out
 
 # Where are the SQL files to setup our tables?
-SQL_DIR = $DATADIR/sql/exchange/
-
-[taler]
-CURRENCY = EUR
-
+SQL_DIR = ${DATADIR}sql/
 
 [exchangedb]