[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-deployment] branch master updated: adapt config generation script
From: |
gnunet |
Subject: |
[taler-deployment] branch master updated: adapt config generation script to config changes |
Date: |
Sun, 19 Jan 2020 18:36:42 +0100 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository deployment.
The following commit(s) were added to refs/heads/master by this push:
new 1a498c4 adapt config generation script to config changes
1a498c4 is described below
commit 1a498c40494f175ea2a98dd55c2229abd4c22c90
Author: Florian Dold <address@hidden>
AuthorDate: Sun Jan 19 18:36:31 2020 +0100
adapt config generation script to config changes
---
config/generate-config | 50 ++++++++++++++++++++++++--------------------------
1 file changed, 24 insertions(+), 26 deletions(-)
diff --git a/config/generate-config b/config/generate-config
index ce01a92..5e5842a 100755
--- a/config/generate-config
+++ b/config/generate-config
@@ -145,9 +145,9 @@ def config(obj):
else:
obj.cfg_put("frontends", "backend",
"https://backend.{}.taler.net/".format(obj.envname))
- obj.cfg_put("exchange-{}".format(obj.currency), "master_key",
obj.exchange_pub)
- obj.cfg_put("exchange-{}".format(obj.currency), "currency", obj.currency)
- obj.cfg_put("exchange-{}".format(obj.currency), "base_url",
"https://exchange.{}.taler.net/".format(obj.envname))
+ obj.cfg_put("merchant-exchange-{}".format(obj.currency), "master_key",
obj.exchange_pub)
+ obj.cfg_put("merchant-exchange-{}".format(obj.currency), "currency",
obj.currency)
+ obj.cfg_put("merchant-exchange-{}".format(obj.currency), "base_url",
"https://exchange.{}.taler.net/".format(obj.envname))
obj.cfg_put("auditor", "auditor_priv_file",
"${TALER_DEPLOYMENT_DATA}/auditor/offline-keys/auditor.priv")
obj.cfg_put("auditor", "serve", "unix")
@@ -176,17 +176,19 @@ def config(obj):
obj.cfg_put("auditordb-postgres", "config",
"postgres:///taler{}".format(obj.envname))
if "demo" != obj.envname and obj.twisted:
- obj.cfg_put("account-1", "url",
"payto://x-taler-bank/twister-bank.wild.gv.taler.net/2")
+ bank_acct_url =
"https://twister-bank.wild.gv.taler.net/taler-wire-gateway/Exchange/"
else:
- obj.cfg_put("account-1", "url",
"payto://x-taler-bank/bank.{}.taler.net/2".format(obj.envname))
-
- obj.cfg_put("account-1", "wire_response",
"${TALER_DEPLOYMENT_DATA}/exchange/wire/test.json")
- obj.cfg_put("account-1", "plugin", "taler_bank")
- obj.cfg_put("account-1", "taler_bank_auth_method", "basic")
- obj.cfg_put("account-1", "username", "Exchange")
- obj.cfg_put("account-1", "password", "x")
- obj.cfg_put("account-1", "enable_debit", "yes")
- obj.cfg_put("account-1", "enable_credit", "yes")
+ bank_acct_url =
f"https://bank.{obj.envname}.taler.net/taler-wire-gateway/Exchange/"
+
+ obj.cfg_put("exchange-account-1", "payto_uri",
"payto://x-taler-bank/bank.{}.taler.net/Exchange".format(obj.envname))
+ obj.cfg_put("exchange-account-1", "wire_response",
"${TALER_DEPLOYMENT_DATA}/exchange/wire/test.json")
+ obj.cfg_put("exchange-account-1", "plugin", "taler_bank")
+ obj.cfg_put("exchange-account-1", "wire_gateway_auth_method", "basic")
+ obj.cfg_put("exchange-account-1", "wire_gateway_url", bank_acct_url)
+ obj.cfg_put("exchange-account-1", "username", "Exchange")
+ obj.cfg_put("exchange-account-1", "password", "x")
+ obj.cfg_put("exchange-account-1", "enable_debit", "yes")
+ obj.cfg_put("exchange-account-1", "enable_credit", "yes")
obj.cfg_put("fees-x-taler-bank", "wire-fee-2018", obj.currency + ":" +
"0.02")
obj.cfg_put("fees-x-taler-bank", "wire-fee-2019", obj.currency + ":" +
"0.03")
@@ -248,19 +250,15 @@ def config(obj):
else:
obj.cfg_put("account-merchant", "url",
"payto://x-taler-bank/bank.{}.taler.net/3".format(obj.envname))
- obj.cfg_put("account-merchant", "plugin", "taler_bank")
- obj.cfg_put("account-merchant", "taler_bank_auth_method", "basic")
- obj.cfg_put("account-merchant", "username", "user")
- obj.cfg_put("account-merchant", "password", "pass")
- obj.cfg_put("account-merchant", "wire_response",
"${TALER_DEPLOYMENT_DATA}/merchant/wire/merchant.json")
- obj.cfg_put("account-merchant", "wire_file_mode", "770")
-
- obj.cfg_put("account-merchant", "HONOR_default", "YES")
- obj.cfg_put("account-merchant", "HONOR_Tor", "YES")
- obj.cfg_put("account-merchant", "HONOR_GNUnet", "YES")
- obj.cfg_put("account-merchant", "HONOR_Taler", "YES")
- obj.cfg_put("account-merchant", "HONOR_FSF", "YES")
- obj.cfg_put("account-merchant", "HONOR_Tutorial", "YES")
+ obj.cfg_put("merchant-account-merchant", "wire_response",
"${TALER_DEPLOYMENT_DATA}/merchant/wire/merchant.json")
+ obj.cfg_put("merchant-account-merchant", "wire_file_mode", "770")
+
+ obj.cfg_put("merchant-account-merchant", "HONOR_default", "YES")
+ obj.cfg_put("merchant-account-merchant", "HONOR_Tor", "YES")
+ obj.cfg_put("merchant-account-merchant", "HONOR_GNUnet", "YES")
+ obj.cfg_put("merchant-account-merchant", "HONOR_Taler", "YES")
+ obj.cfg_put("merchant-account-merchant", "HONOR_FSF", "YES")
+ obj.cfg_put("merchant-account-merchant", "HONOR_Tutorial", "YES")
coin(obj, "ct_10", "0.10")
coin(obj, "1", "1")
--
To stop receiving notification emails like this one, please contact
address@hidden.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-deployment] branch master updated: adapt config generation script to config changes,
gnunet <=