taler-deployment

commit eb56fbfaa78bdf6bee0db7d020e03b79fedc1741
parent e0f8ec645027d9d212015103758d8cbd8a242100
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sun,  6 Sep 2020 21:49:57 +0200

fix #6579: do not have two entries in config for the same exchange

Diffstat:
M
bin/taler-config-generate
 | 
13
++++---------

1 file changed, 4 insertions(+), 9 deletions(-)
diff --git 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")