diff --git a/contrib/taler-bank-manage-testing b/contrib/taler-bank-manage-testing index 11790271b..cd9e41a1c 100755 --- a/contrib/taler-bank-manage-testing +++ b/contrib/taler-bank-manage-testing @@ -37,7 +37,7 @@ libeufin-sandbox serve --port "1$1" \ > libeufin-sandbox-stdout.log \ 2> libeufin-sandbox-stderr.log & echo $! > libeufin-sandbox.pid -export LIBEUFIN_SANDBOX_URL="http://localhost:1$1/demobanks/default" +export LIBEUFIN_SANDBOX_URL="http://localhost:1$1/" set +e echo -n "Waiting for Sandbox.." for n in `seq 1 50`; do diff --git a/contrib/taler-nexus-prepare b/contrib/taler-nexus-prepare index 6a36387d9..d98e5eb43 100755 --- a/contrib/taler-nexus-prepare +++ b/contrib/taler-nexus-prepare @@ -17,24 +17,24 @@ FACADE_LABEL="my-facade" export LIBEUFIN_SANDBOX_USERNAME=exchange export LIBEUFIN_SANDBOX_PASSWORD=x -export LIBEUFIN_SANDBOX_URL=http://localhost:5000/demobanks/default +export LIBEUFIN_SANDBOX_URL=http://localhost:5000/ libeufin-cli sandbox demobank register --name "Exchange Company" export LIBEUFIN_SANDBOX_USERNAME=fortytwo export LIBEUFIN_SANDBOX_PASSWORD=x -export LIBEUFIN_SANDBOX_URL=http://localhost:5000/demobanks/default +export LIBEUFIN_SANDBOX_URL=http://localhost:5000/ libeufin-cli sandbox demobank register \ --name User42 --iban FR7630006000011234567890189 export LIBEUFIN_SANDBOX_USERNAME=fortythree export LIBEUFIN_SANDBOX_PASSWORD=x -export LIBEUFIN_SANDBOX_URL=http://localhost:5000/demobanks/default +export LIBEUFIN_SANDBOX_URL=http://localhost:5000/ libeufin-cli sandbox demobank register \ --name User43 --iban GB33BUKB20201555555555 export LIBEUFIN_SANDBOX_USERNAME=admin export LIBEUFIN_SANDBOX_PASSWORD=secret -export LIBEUFIN_SANDBOX_URL=http://localhost:5000/demobanks/default +export LIBEUFIN_SANDBOX_URL=http://localhost:5000/ echo -n "Create EBICS host at Sandbox..." libeufin-cli sandbox \ --sandbox-url "http://localhost:5000" \ diff --git a/src/auditor/generate-auditor-basedb.sh b/src/auditor/generate-auditor-basedb.sh index 5dfc263c4..085c8c053 100755 --- a/src/auditor/generate-auditor-basedb.sh +++ b/src/auditor/generate-auditor-basedb.sh @@ -102,7 +102,7 @@ export EXCHANGE_URL=`taler-config -c $CONF -s EXCHANGE -o BASE_URL` MERCHANT_PORT=`taler-config -c $CONF -s MERCHANT -o PORT` export MERCHANT_URL=http://localhost:${MERCHANT_PORT}/ BANK_PORT=`taler-config -c $CONF -s BANK -o HTTP_PORT` -BANK_URL="http://localhost:1${BANK_PORT}/demobanks/default" +BANK_URL="http://localhost:1${BANK_PORT}" export AUDITOR_URL=http://localhost:8083/ AUDITOR_PRIV_FILE=$1.apriv AUDITOR_PRIV_DIR=`dirname $AUDITOR_PRIV_FILE` @@ -149,7 +149,7 @@ libeufin-sandbox serve --port "1${BANK_PORT}" \ 2> ${MY_TMP_DIR}/libeufin-sandbox-stderr.log & echo $! > ${MY_TMP_DIR}/libeufin-sandbox.pid cd $ORIGIN -export LIBEUFIN_SANDBOX_URL="http://localhost:1${BANK_PORT}/demobanks/default" +export LIBEUFIN_SANDBOX_URL="http://localhost:1${BANK_PORT}" echo $LIBEUFIN_SANDBOX_URL set +e echo -n "Waiting for Sandbox..." diff --git a/src/auditor/generate-revoke-basedb.sh b/src/auditor/generate-revoke-basedb.sh index 2e3fbe750..15ef0ff23 100755 --- a/src/auditor/generate-revoke-basedb.sh +++ b/src/auditor/generate-revoke-basedb.sh @@ -103,7 +103,7 @@ export EXCHANGE_URL=`taler-config -c $CONF -s EXCHANGE -o BASE_URL` MERCHANT_PORT=`taler-config -c $CONF -s MERCHANT -o PORT` export MERCHANT_URL=http://localhost:${MERCHANT_PORT}/ BANK_PORT=`taler-config -c $CONF -s BANK -o HTTP_PORT` -export BANK_URL=http://localhost:1${BANK_PORT}/demobanks/default +export BANK_URL=http://localhost:1${BANK_PORT} export AUDITOR_URL=http://localhost:8083/ AUDITOR_PRIV_FILE=$1.apriv AUDITOR_PRIV_DIR=`dirname $AUDITOR_PRIV_FILE` @@ -152,7 +152,7 @@ libeufin-sandbox serve --port "1${BANK_PORT}" \ 2> ${MY_TMP_DIR}/libeufin-sandbox-stderr.log & echo $! > ${MY_TMP_DIR}/libeufin-sandbox.pid cd $ORIGIN -export LIBEUFIN_SANDBOX_URL="http://localhost:1${BANK_PORT}/demobanks/default" +export LIBEUFIN_SANDBOX_URL="http://localhost:1${BANK_PORT}" set +e echo -n "Waiting for Sandbox..." OK=0 diff --git a/src/auditor/test-revocation.sh b/src/auditor/test-revocation.sh index 0ed79f237..187cc0311 100755 --- a/src/auditor/test-revocation.sh +++ b/src/auditor/test-revocation.sh @@ -140,7 +140,7 @@ function nexus_submit_to_sandbox () { function get_payto_uri() { export LIBEUFIN_SANDBOX_USERNAME=$1 export LIBEUFIN_SANDBOX_PASSWORD=$2 - export LIBEUFIN_SANDBOX_URL=http://localhost:18082/demobanks/default + export LIBEUFIN_SANDBOX_URL=http://localhost:18082 libeufin-cli sandbox demobank info --bank-account $1 | jq --raw-output '.paytoUri' }