[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-anastasis] branch master updated: -adapt to changes in taler-exch
From: |
gnunet |
Subject: |
[taler-anastasis] branch master updated: -adapt to changes in taler-exchange configuration structure |
Date: |
Fri, 30 Jul 2021 21:22:08 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository anastasis.
The following commit(s) were added to refs/heads/master by this push:
new 2234a99 -adapt to changes in taler-exchange configuration structure
2234a99 is described below
commit 2234a9975d52ba40d02193bb0dc827d69d00548c
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Fri Jul 30 21:22:06 2021 +0200
-adapt to changes in taler-exchange configuration structure
---
contrib/gana | 2 +-
src/cli/test_anastasis_reducer_enter_secret.sh | 2 +-
...est_anastasis_reducer_recovery_enter_user_attributes.sh | 2 +-
src/testing/test_anastasis_api.conf | 14 +++++++++-----
4 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/contrib/gana b/contrib/gana
index 755e752..0f1eb85 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit 755e752e3a235df0be8d45374835b109f7843c1c
+Subproject commit 0f1eb8555b89056fe62e093211e53a1f9ba85d56
diff --git a/src/cli/test_anastasis_reducer_enter_secret.sh
b/src/cli/test_anastasis_reducer_enter_secret.sh
index dadd8d0..a5f1934 100755
--- a/src/cli/test_anastasis_reducer_enter_secret.sh
+++ b/src/cli/test_anastasis_reducer_enter_secret.sh
@@ -102,7 +102,7 @@ DATA_DIR=`taler-config -f -c $CONF -s PATHS -o TALER_HOME`
rm -rf $DATA_DIR
# obtain key configuration data
-MASTER_PRIV_FILE=`taler-config -f -c $CONF -s EXCHANGE -o MASTER_PRIV_FILE`
+MASTER_PRIV_FILE=`taler-config -f -c $CONF -s "EXCHANGE-OFFLINE" -o
"MASTER_PRIV_FILE"`
MASTER_PRIV_DIR=`dirname $MASTER_PRIV_FILE`
mkdir -p $MASTER_PRIV_DIR
gnunet-ecc -g1 $MASTER_PRIV_FILE > /dev/null 2> /dev/null
diff --git a/src/cli/test_anastasis_reducer_recovery_enter_user_attributes.sh
b/src/cli/test_anastasis_reducer_recovery_enter_user_attributes.sh
index d0562e2..85eb64f 100755
--- a/src/cli/test_anastasis_reducer_recovery_enter_user_attributes.sh
+++ b/src/cli/test_anastasis_reducer_recovery_enter_user_attributes.sh
@@ -101,7 +101,7 @@ DATA_DIR=`taler-config -f -c $CONF -s PATHS -o TALER_HOME`
rm -rf $DATA_DIR
# obtain key configuration data
-MASTER_PRIV_FILE=`taler-config -f -c $CONF -s EXCHANGE -o MASTER_PRIV_FILE`
+MASTER_PRIV_FILE=`taler-config -f -c $CONF -s "EXCHANGE-OFFLINE" -o
"MASTER_PRIV_FILE"`
MASTER_PRIV_DIR=`dirname $MASTER_PRIV_FILE`
mkdir -p $MASTER_PRIV_DIR
gnunet-ecc -g1 $MASTER_PRIV_FILE > /dev/null 2> /dev/null
diff --git a/src/testing/test_anastasis_api.conf
b/src/testing/test_anastasis_api.conf
index bde7ee1..5abd0db 100644
--- a/src/testing/test_anastasis_api.conf
+++ b/src/testing/test_anastasis_api.conf
@@ -183,11 +183,6 @@ MASTER_PUBLIC_KEY =
T1VVFQZZARQ1CMF4BN58EE7SKTW5AV2BS18S87ZEGYS4S29J6DNG
BASE_URL = "http://localhost:8081/"
#BASE_URL = https://exchange.test.taler.net/
-KEYDIR = ${TALER_DATA_HOME}/exchange/live-keys/
-
-REVOCATION_DIR = ${TALER_DATA_HOME}/exchange/revocations/
-
-
# Network configuration for the normal API/service HTTP server
# serve via tcp socket (on PORT)
SERVE = tcp
@@ -201,6 +196,15 @@ MASTER_PRIV_FILE =
${TALER_DATA_HOME}/exchange/offline-keys/master.priv
SECM_TOFU_FILE = ${TALER_DATA_HOME}/exchange/offline-keys/secm_tofus.pub
+[taler-exchange-secmod-eddsa]
+# Where do we store the generated private keys.
+KEY_DIR = ${TALER_DATA_HOME}/exchange-secmod-eddsa/keys
+
+[taler-exchange-secmod-rsa]
+# Where do we store the generated private keys.
+KEY_DIR = ${TALER_DATA_HOME}/exchange-secmod-rsa/keys
+
+
[exchangedb-postgres]
CONFIG = "postgres:///talercheck"
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-anastasis] branch master updated: -adapt to changes in taler-exchange configuration structure,
gnunet <=