commit 4168ad386af09884c8d23c95ba6d6545de8235e7
parent 830b87a45c0f6d91d766f37f753af5ead19bfc9b
Author: Christian Grothoff <christian@grothoff.org>
Date: Sun, 5 Mar 2023 00:44:07 +0100
fix config location
Diffstat:
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/netzbon/setup-exchange.sh b/netzbon/setup-exchange.sh
@@ -45,6 +45,7 @@ fi
# set the MASTER_PUBLIC_KEY to some value we can use.
export MASTER_PRIV_DIR=.local/share/taler/exchange/offline-keys
export MASTER_PRIV_FILE=${MASTER_PRIV_DIR}/master.priv
+export SECMOD_TOFU_FILE=${MASTER_PRIV_DIR}/secm_tofus.pub
if test -z ${MASTER_PUBLIC_KEY:-}
then
if test ${DO_OFFLINE:-y} == n
@@ -108,8 +109,10 @@ echo -e "[taler]\n"\
"AML_THRESHOLD=${CURRENCY}:1000000\n"\
"\n[exchange]\n"\
"MASTER_PUBLIC_KEY=${MASTER_PUBLIC_KEY}\n"\
- "MASTER_PRIV_FILE=\$HOME/${MASTER_PRIV_FILE}\n"\
"BASE_URL=${EXCHANGE_BASE_URL}\n"\
+ "\n[exchange-offline]\n"\
+ "MASTER_PRIV_FILE=\$HOME/${MASTER_PRIV_FILE}\n"\
+ "SECM_TOFU_FILE=\$HOME/${SECMOD_TOFU_FILE}\n"\
"\n[merchant-exchange-${DOMAIN_NAME}]\n"\
"MASTER_KEY=${MASTER_PUBLIC_KEY}\n"\
"CURRENCY=${CURRENCY}\n"\
@@ -155,20 +158,20 @@ say "Launching exchange"
systemctl enable --now taler-exchange.target
-echo -n "Waiting for exchange..."
+say "Waiting for exchange HTTP service (/config)..."
curl --max-time 2 \
--retry-connrefused \
--retry-delay 1 \
--retry 10 \
${EXCHANGE_BASE_URL}config &> /dev/null
-echo "DONE"
+say "DONE"
-echo -n "Waiting for exchange keys (this may take a while)..."
+say "Waiting for exchange management keys (this may take a while)..."
curl --max-time 30 \
--retry-delay 1 \
--retry 60 \
${EXCHANGE_BASE_URL}management/keys &> /dev/null
-echo "DONE"
+say "DONE"
say "Offline interaction..."
@@ -185,10 +188,12 @@ then
upload
fi
-echo -n "Waiting for exchange /keys..."
+say "Waiting for exchange /keys..."
curl --max-time 2 \
--retry-connrefused \
--retry-delay 1 \
--retry 10 \
${EXCHANGE_BASE_URL}keys &> /dev/null
-echo "DONE"
+say "DONE"
+
+say "Exchange setup finished"