commit 9ce1d2113536d35953ef10553fb4ed546e9a688a parent a58b5b9381a0e8c3c513a38ca44ef9a1670a3177 Author: Christian Grothoff <christian@grothoff.org> Date: Sat, 4 Mar 2023 20:27:00 +0100 fix config generation Diffstat:
| M | netzbon/setup-exchange.sh | | | 19 | +++++++++---------- |
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/netzbon/setup-exchange.sh b/netzbon/setup-exchange.sh @@ -43,12 +43,14 @@ fi # Create master key as taler-exchange-offline *unless* user already # 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 if test -z ${MASTER_PUBLIC_KEY:-} then say "Setting up offline key" - sudo -i -u taler-exchange-offline mkdir -p .local/share/taler/exchange/offline-keys - sudo -i -u taler-exchange-offline gnunet-ecc -g1 .local/share/taler/exchange/offline-keys/master.priv - MASTER_PUBLIC_KEY=`sudo -i -u taler-exchange-offline gnunet-ecc -p .local/share/taler/exchange/offline-keys/master.priv` + sudo -E -i -u taler-exchange-offline mkdir -p ${MASTER_PRIV_DIR} + sudo -E -i -u taler-exchange-offline gnunet-ecc -g1 ${MASTER_PRIV_FILE} + MASTER_PUBLIC_KEY=`sudo -i -E -u taler-exchange-offline gnunet-ecc -p ${MASTER_PRIV_FILE}` fi export MASTER_PUBLIC_KEY @@ -82,18 +84,15 @@ echo -e "[taler]\n"\ "CURRENCY=${CURRENCY}\n"\ "CURRENCY_ROUND_UNIT=${CURRENCY}:0.01\n"\ "AML_THRESHOLD=${CURRENCY}:1000000\n"\ - "\n"\ - "[exchange]\n"\ + "\n[exchange]\n"\ "MASTER_PUBLIC_KEY=${MASTER_PUBLIC_KEY}\n"\ - "MASTER_PRIV_FILE=${MASTER_PUBLIC_KEY}\n"\ + "MASTER_PRIV_FILE=\$HOME/${MASTER_PRIV_FILE}\n"\ "BASE_URL=${EXCHANGE_BASE_URL}\n"\ - "\n"\ - "[merchant-exchange-${DOMAIN_NAME}]\n"\ + "\n[merchant-exchange-${DOMAIN_NAME}]\n"\ "MASTER_KEY=${MASTER_PUBLIC_KEY}\n"\ "CURRENCY=${CURRENCY}\n"\ "EXCHANGE_BASE_URL=${EXCHANGE_BASE_URL}\n"\ - "\n"\ - "[exchange-account-default]\n"\ + "\n[exchange-account-default]\n"\ "PAYTO_URI=${EXCHANGE_PAYTO}\n"\ "ENABLE_DEBIT=YES\n"\ "ENABLE_CREDIT=YES\n"\