From faab50be573a3d1bb7f694b992ac748795fb5ef8 Mon Sep 17 00:00:00 2001 From: Marcello Stanisci Date: Thu, 26 Apr 2018 12:33:00 +0200 Subject: merchant config give trusted exchanges as of the new 'exchange-*' format --- config/generate-config | 46 +++++++++------------------------------------- 1 file changed, 9 insertions(+), 37 deletions(-) (limited to 'config') diff --git a/config/generate-config b/config/generate-config index f9b8fe9..5f2ba55 100755 --- a/config/generate-config +++ b/config/generate-config @@ -113,11 +113,19 @@ def config(currency, envname, exchange_pub, standalone): cfg_put("merchant-exchange-test", "master_key", exchange_pub) cfg_put("frontends", "backend_apikey", "sandbox".format(envname)) + if standalone: - cfg_put("frontends", "backend", "https://env.taler.net/{}/merchant-backend/".format(envname)) + cfg_put("frontends", "backend", "https://env.taler.net/{}/merchant-backend/".format(os.getenv("USER"))) else: cfg_put("frontends", "backend", "https://backend.{}.taler.net/".format(envname)) + cfg_put("exchange-".format(currency), "master_key", exchange_pub) + cfg_put("exchange-".format(currency), "currency", currency) + if standalone: + cfg_put("exchange-".format(currency), "base_url", "https://env.taler.net/{}/exchange".format(os.getenv("USER"))) + else: + cfg_put("exchange-".format(currency), "base_url", "https://exchange.{}.taler.net/".format(envname)) + cfg_put("auditor", "auditor_priv_file", "${TALER_DEPLOYMENT_SHARED}/auditor/offline-keys/auditor.priv") cfg_put("exchange", "base_url", "https://exchange.{}.taler.net/".format(envname)) @@ -128,8 +136,6 @@ def config(currency, envname, exchange_pub, standalone): cfg_put("exchange", "master_priv_file", "${TALER_DEPLOYMENT_SHARED}/exchange/offline-keys/master.priv") cfg_put("exchange", "keydir", "${TALER_DEPLOYMENT_SHARED}/exchange/live-keys/") - cfg_put("exchange-admin", "serve", "unix") - cfg_put("exchange-admin", "unixpath", "$HOME/sockets/exchange-admin.http") cfg_put("exchangedb", "auditor_base_dir", "${TALER_DEPLOYMENT_SHARED}/exchange/auditors/") cfg_put("exchangedb", "wirefee_base_dir", "${TALER_DEPLOYMENT_SHARED}/exchange/wirefees/") @@ -144,11 +150,6 @@ def config(currency, envname, exchange_pub, standalone): cfg_put("auditordb-postgres", "db_conn_str", "postgres:///taler{}".format(envname)) cfg_put("auditordb-postgres", "config", "postgres:///taler{}".format(envname)) - if standalone: - cfg_put("exchange-wire-test", "bank_url", "https://env.taler.net/{}/bank/".format(envname)) - else: - cfg_put("exchange-wire-test", "bank_url", "https://bank.{}.taler.net/".format(envname)) - if standalone: cfg_put("account-1", "url", "payto://x-taler-bank/env.taler.net/{}/bank/2".format(envname)) else: @@ -162,11 +163,6 @@ def config(currency, envname, exchange_pub, standalone): cfg_put("account-1", "enable_debit", "yes") cfg_put("account-1", "enable_credit", "yes") - cfg_put("exchange-wire-test", "bank_account_number", "1") - cfg_put("exchange-wire-test", "exchange_account_number", "2") - cfg_put("exchange-wire-test", "enable", "yes") - cfg_put("exchange-wire-test", "test_response_file", "${TALER_DEPLOYMENT_SHARED}/exchange/wire/test.json") - cfg_put("fees-x-taler-bank", "wire-fee-2018", currency + ":" + "0.02") cfg_put("fees-x-taler-bank", "wire-fee-2019", currency + ":" + "0.03") cfg_put("fees-x-taler-bank", "wire-fee-2020", currency + ":" + "0.04") @@ -185,30 +181,6 @@ def config(currency, envname, exchange_pub, standalone): cfg_put("fees-x-taler-bank", "closing-fee-2024", currency + ":" + "0.01") cfg_put("fees-x-taler-bank", "closing-fee-2025", currency + ":" + "0.01") - - cfg_put("exchange-wire-test", "wire-fee-2017", currency + ":" + "0.01") - cfg_put("exchange-wire-test", "wire-fee-2018", currency + ":" + "0.02") - cfg_put("exchange-wire-test", "wire-fee-2019", currency + ":" + "0.03") - cfg_put("exchange-wire-test", "wire-fee-2020", currency + ":" + "0.04") - cfg_put("exchange-wire-test", "wire-fee-2021", currency + ":" + "0.04") - cfg_put("exchange-wire-test", "wire-fee-2022", currency + ":" + "0.05") - cfg_put("exchange-wire-test", "wire-fee-2023", currency + ":" + "0.06") - cfg_put("exchange-wire-test", "wire-fee-2024", currency + ":" + "0.07") - cfg_put("exchange-wire-test", "wire-fee-2025", currency + ":" + "0.08") - - cfg_put("exchange-wire-test", "closing-fee-2017", currency + ":" + "0.01") - cfg_put("exchange-wire-test", "closing-fee-2018", currency + ":" + "0.02") - cfg_put("exchange-wire-test", "closing-fee-2019", currency + ":" + "0.03") - cfg_put("exchange-wire-test", "closing-fee-2020", currency + ":" + "0.04") - cfg_put("exchange-wire-test", "closing-fee-2021", currency + ":" + "0.04") - cfg_put("exchange-wire-test", "closing-fee-2022", currency + ":" + "0.05") - cfg_put("exchange-wire-test", "closing-fee-2023", currency + ":" + "0.06") - cfg_put("exchange-wire-test", "closing-fee-2024", currency + ":" + "0.07") - cfg_put("exchange-wire-test", "closing-fee-2025", currency + ":" + "0.08") - - cfg_put("exchange-wire-test", "username", "Exchange") - cfg_put("exchange-wire-test", "password", "x") - # how long is one signkey valid? cfg_put("exchange_keys", "signkey_duration", "18 weeks") -- cgit v1.2.3