commit 88536b476c20b934f01af2ddd6a26c8b6c23874e
parent f9a210359358ff7de754f1b48ab2fd48a99491dd
Author: Sebastian <sebasjm@gmail.com>
Date: Thu, 7 Aug 2025 16:27:20 +0200
some workaround after breaking changes
Diffstat:
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/regional-currency/container/README b/regional-currency/container/README
@@ -15,7 +15,10 @@ from cli and you will get the response of the nginx running inside the container
From now on you can kill the container, stop it and start it again. Running the `start.sh` will replace all the previous information.
-Starting the container won't setup the regional currency environment, for that you have to get inside the virtual machine using `enter.sh` when the container is running and run the `run.sh` script which will make sure no previous values are carried from old setup and run the `main.sh` script. Since the regional-currency folder will be located in the `/root` directory inside the virtual machine the run script can be run using the following command:
+Starting the container won't setup the regional currency environment, for that you first have to get inside the virtual machine using `enter.sh` when the container is running.
+Second execute the `run.sh` script while you are inside the container. This script is based on the `main.sh` script but it will override the configuration (if you have a previous one) to make sure you can run it more than once and some other workarounds.
+
+Since the regional-currency folder will be located in the `/root` directory inside the virtual machine the run script can be run using the following command:
# /root/container/run.sh
diff --git a/regional-currency/setup-exchange.sh b/regional-currency/setup-exchange.sh
@@ -86,6 +86,9 @@ systemctl stop taler-exchange.target &>> setup.log
say "Configuring exchange"
+say "Removing optimized files" #FIXME remove when this file works
+rm -f /usr/share/taler-exchange/{aml,kyc}-spa/*.{zstd,gz}
+
# Generate terms of service (ToS)
TERMS_ETAG=
if test ${DO_EXCHANGE_TERMS} == y; then
@@ -167,6 +170,10 @@ taler-harness deployment gen-coin-config \
sed -e "s/FEE_DEPOSIT = ${CURRENCY}:0.01/FEE_DEPOSIT = ${CURRENCY}:0/" \
>/etc/taler-exchange/conf.d/"${CURRENCY}"-coins.conf
+say "Fixing coin configuraiton..."
+# FIXME: Fix exchange configuration, remove when taler-harness is updated
+sed 's/coin-/coin_/i' -i /etc/taler-exchange/conf.d/*-coins.conf
+
say "Initializing exchange database"
taler-exchange-dbconfig &>> setup.log
diff --git a/regional-currency/setup-merchant.sh b/regional-currency/setup-merchant.sh
@@ -6,13 +6,16 @@ source functions.sh
source config/user.conf
source config/internal.conf
-say "Setting up merchant database"
+say "Setting up merchant database" #FIXME remove when this file works
taler-merchant-dbconfig &>> setup.log
expect_vars CURRENCY PROTO DOMAIN_NAME MASTER_PUBLIC_KEY
export EXCHANGE_BASE_URL="$PROTO://exchange.${DOMAIN_NAME}/"
+say "Removing optimized files"
+rm -f /usr/share/taler-merchant/spa/*.{zstd,gz}
+
cat << EOF > /etc/taler-merchant/conf.d/setup.conf
[merchant]
CURRENCY=${CURRENCY}