diff options
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/taler-deployment | 46 | ||||
| -rwxr-xr-x | bin/taler-deployment-prepare | 23 |
2 files changed, 19 insertions, 50 deletions
diff --git a/bin/taler-deployment b/bin/taler-deployment index 6b098a5..680cb26 100755 --- a/bin/taler-deployment +++ b/bin/taler-deployment @@ -255,16 +255,6 @@ def build_sync(r, p): (p / "taler-buildstamp").touch() -def build_bank(r, p): - update_checkout(r, p) - subprocess.run(["pip3", "install", "poetry"], check=True) - subprocess.run(["./bootstrap"], check=True) - pfx = Path.home() / "local" - pyconfigure() - subprocess.run(["make", "install"], check=True) - (p / "taler-buildstamp").touch() - - def build_demos(r, p): update_checkout(r, p) pfx = Path.home() / "local" @@ -296,6 +286,12 @@ def get_repos(envname): if envname in ("docs-builder",): return [ Repo( + "libeufin", + "git://git.taler.net/libeufin.git", + [], + build_libeufin, + ), + Repo( "libmicrohttpd", "git://git.gnunet.org/libmicrohttpd.git", [], @@ -352,12 +348,6 @@ def get_repos(envname): ["libmicrohttpd"], build_gnunet), Repo( - "bank", - "git://git.taler.net/bank", - [], - build_bank - ), - Repo( "wallet-core", "git://git.taler.net/wallet-core", [], @@ -387,16 +377,16 @@ def get_repos(envname): if envname in ("euro", "chf"): return [ Repo( - "libmicrohttpd", - "git://git.gnunet.org/libmicrohttpd.git", + "libeufin", + "git://git.taler.net/libeufin.git", [], - build_libmicrohttpd, + build_libeufin, ), Repo( - "bank", - "git://git.taler.net/bank", + "libmicrohttpd", + "git://git.gnunet.org/libmicrohttpd.git", [], - build_bank, + build_libmicrohttpd, ), Repo( "gnunet", @@ -426,16 +416,16 @@ def get_repos(envname): if envname in ("tanker", "local", "demo", "int", "test", "auditor-reporter-test", "auditor-reporter-demo"): return [ Repo( - "wallet-core", - "git://git.taler.net/wallet-core", + "libeufin", + "git://git.taler.net/libeufin.git", [], - build_wallet, + build_libeufin, ), Repo( - "bank", - "git://git.taler.net/bank", + "wallet-core", + "git://git.taler.net/wallet-core", [], - build_bank, + build_wallet, ), Repo( "libmicrohttpd", diff --git a/bin/taler-deployment-prepare b/bin/taler-deployment-prepare index 42311fc..700fee1 100755 --- a/bin/taler-deployment-prepare +++ b/bin/taler-deployment-prepare @@ -163,7 +163,7 @@ taler-exchange-offline enable-account "$payto_uri" upload year=$(date +%Y) curr=$TALER_CONFIG_CURRENCY for y in $(seq $year $((year + 5))); do - taler-exchange-offline wire-fee $y x-taler-bank "$curr:0.01" "$curr:0.01" "$curr:0.01" upload + taler-exchange-offline wire-fee $y sepa "$curr:0.01" "$curr:0.01" "$curr:0.01" upload done taler-deployment-arm -k taler-exchange @@ -175,27 +175,6 @@ taler-deployment-arm -k taler-exchange-secmod-eddsa sleep 5 ## -## Step 4: Set up the bank -## - -# Delete existing data from bank. -if test $WITH_DB_RESET = yes; then - echo "yes" | taler-bank-manage django flush -fi - -case $TALER_ENV_NAME in - demo|test|int|local|tanker) - taler-bank-manage django provide_accounts - taler-bank-manage django changepassword_unsafe Exchange x - taler-bank-manage django changepassword_unsafe Survey x - ;; - *) - echo "Not setting unsafe Exchange bank account password for env $TALER_ENV_NAME" - ;; -esac - - -## ## Step 5: Adjust some permissions ## |