[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-deployment] branch master updated: fix #6579: do not have two ent
From: |
gnunet |
Subject: |
[taler-deployment] branch master updated: fix #6579: do not have two entries in config for the same exchange |
Date: |
Sun, 06 Sep 2020 21:49:59 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository deployment.
The following commit(s) were added to refs/heads/master by this push:
new eb56fbf fix #6579: do not have two entries in config for the same
exchange
eb56fbf is described below
commit eb56fbfaa78bdf6bee0db7d020e03b79fedc1741
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sun Sep 6 21:49:57 2020 +0200
fix #6579: do not have two entries in config for the same exchange
---
bin/taler-config-generate | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/bin/taler-config-generate b/bin/taler-config-generate
index f4cf486..03ba084 100755
--- a/bin/taler-config-generate
+++ b/bin/taler-config-generate
@@ -128,14 +128,6 @@ def config(obj):
obj.cfg_put("merchantdb-postgres", "config",
"postgres:///taler{}".format(obj.envname))
- if "demo" != obj.envname and obj.twisted:
- obj.cfg_put("merchant-exchange-test", "exchange_base_url",
"https://twister-exchange.wild.gv.taler.net/")
- else:
- obj.cfg_put("merchant-exchange-test", "exchange_base_url",
"https://exchange.{}.taler.net/".format(obj.envname))
-
- obj.cfg_put("merchant-exchange-test", "master_key", obj.exchange_pub)
- obj.cfg_put("merchant-exchange-test", "currency", obj.currency)
-
obj.cfg_put("frontends", "backend_apikey", "sandbox".format(obj.envname))
if "demo" != obj.envname and obj.twisted:
@@ -145,8 +137,11 @@ def config(obj):
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),
"exchange_base_url", "https://exchange.{}.taler.net/".format(obj.envname))
+ if "demo" != obj.envname and obj.twisted:
+ obj.cfg_put("merchant-exchange-{}".format(obj.currency),
"exchange_base_url", "https://twister-exchange.wild.gv.taler.net/")
+ else:
+ obj.cfg_put("merchant-exchange-{}".format(obj.currency),
"exchange_base_url", "https://exchange.{}.taler.net/".format(obj.envname))
obj.cfg_put("auditor", "serve", "unix")
obj.cfg_put("auditor", "auditor_url",
"https://auditor.{}.taler.net/service/".format(obj.envname))
obj.cfg_put("auditor", "unixpath", "$HOME/sockets/auditor.http")
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-deployment] branch master updated: fix #6579: do not have two entries in config for the same exchange,
gnunet <=