taler-deployment

commit 4772b13c7efaa9beba96c518eccce99c8f64845a
parent 924cb1d1b599093a843e4217cc883b39df1595dd
Author: Florian Dold <florian.dold@gmail.com>
Date:   Fri, 24 Apr 2020 12:28:21 +0530

config generation

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

1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/bin/taler-config-generate b/bin/taler-config-generate
@@ -122,7 +122,6 @@ def config(obj):
     obj.cfg_put("backoffice-all", "uwsgi_unixpath", "$HOME/sockets/backoffice.uwsgi")
     obj.cfg_put("backoffice-all", "instances", "FSF default Tor")
 
-    obj.cfg_put("merchant", "wireformat", "test")
     obj.cfg_put("merchant", "serve", "unix")
     obj.cfg_put("merchant", "unixpath", "$HOME/sockets/merchant.http")
     obj.cfg_put("merchant", "wire_transfer_delay", "0 s")
@@ -131,13 +130,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", "url", "https://twister-exchange.wild.gv.taler.net/")
-    else:
-        obj.cfg_put("merchant-exchange-test", "url", "https://exchange.{}.taler.net/".format(obj.envname))
-
-    obj.cfg_put("merchant-exchange-test", "master_key", obj.exchange_pub)
-
     obj.cfg_put("frontends", "backend_apikey", "sandbox".format(obj.envname))
 
     if "demo" != obj.envname and obj.twisted:
@@ -147,7 +139,7 @@ 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), "base_url", "https://exchange.{}.taler.net/".format(obj.envname))
+    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))