diff options
| author | ms <ms@taler.net> | 2021-09-18 12:18:08 +0200 |
|---|---|---|
| committer | ms <ms@taler.net> | 2021-09-18 12:18:08 +0200 |
| commit | f0a419150fa7fe1c0769767e0d26e71aa89f8b4e (patch) | |
| tree | 72ab8ae5d29f8b210a656160cb41e4b58bad4b5f | |
| parent | 2ea03eb638f832f0f822c2d9a4494bea425d4923 (diff) | |
| download | deployment-f0a419150fa7fe1c0769767e0d26e71aa89f8b4e.tar.gz deployment-f0a419150fa7fe1c0769767e0d26e71aa89f8b4e.tar.bz2 deployment-f0a419150fa7fe1c0769767e0d26e71aa89f8b4e.zip | |
logging
| -rwxr-xr-x | bin/taler-deployment-config-instances-iban | 3 | ||||
| -rwxr-xr-x | bin/taler-deployment-prepare-with-eufin | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/bin/taler-deployment-config-instances-iban b/bin/taler-deployment-config-instances-iban index 64f952c..36db542 100755 --- a/bin/taler-deployment-config-instances-iban +++ b/bin/taler-deployment-config-instances-iban @@ -34,7 +34,6 @@ def wait_merchant_up(): # Check it started correctly and it is ready to serve requests. checks = 10 url = urljoin(MERCHANT_BACKEND_BASE_URL, "/config") - print("Check URL: {}".format(url)) while checks > 0: try: resp = requests.get(url, timeout=5) @@ -50,7 +49,6 @@ def wait_merchant_up(): continue # Ready. - print("Merchant is up and running") return True print("Merchant is not correctly serving requests.") @@ -159,6 +157,7 @@ ensure_instance( payto_uris=[f"payto://sepa/bank.{TALER_ENV_NAME}.taler.net/{ibans.get('blog')}"], auth=dict(method="token", token=TALER_ENV_FRONTENDS_APITOKEN), ) +print("Stopping the ARM merchant") system("taler-deployment-arm -k taler-merchant") # NOTE: ARM itself will be stopped by the main prepare script. # Stopping here will result in indefinite wait at the caller. diff --git a/bin/taler-deployment-prepare-with-eufin b/bin/taler-deployment-prepare-with-eufin index c07bef2..4f3345d 100755 --- a/bin/taler-deployment-prepare-with-eufin +++ b/bin/taler-deployment-prepare-with-eufin @@ -70,7 +70,7 @@ echo " OK" ## ## Step 1b: initialize database ## -if test $WITH_DB_RESET = yes; then +if test $WITH_DB_RESET = resetDb; then echo -n "Reset and init exchange DB.." taler-exchange-dbinit --reset echo " OK" @@ -173,7 +173,7 @@ sleep 5 ## Step 4: Set up euFin ## -if test $WITH_DB_RESET = yes; then +if test $WITH_DB_RESET = resetDb; then echo -n "Resetting euFin databases.." # NOTE/FIXME: those values _could_ be extracted from # the environment, as this one contains already the DB @@ -372,7 +372,7 @@ esac ## Step 6: Set up merchant ## -if test $WITH_DB_RESET = yes; then +if test $WITH_DB_RESET = resetDb; then echo -n "Reset and init merchant database.." taler-merchant-dbinit --reset echo " OK" @@ -406,7 +406,7 @@ fi echo "Configuring instances" taler-deployment-config-instances-iban - +echo "Stopping exchange services" taler-deployment-arm -k taler-exchange taler-deployment-arm -k taler-exchange-secmod-rsa taler-deployment-arm -k taler-exchange-secmod-eddsa |