diff options
| author | Christian Grothoff <christian@grothoff.org> | 2020-09-06 21:49:57 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2020-09-06 21:49:57 +0200 |
| commit | eb56fbfaa78bdf6bee0db7d020e03b79fedc1741 (patch) | |
| tree | 699d52721497a51b6e39dbf74622164070b728cc /bin/taler-config-generate | |
| parent | e0f8ec645027d9d212015103758d8cbd8a242100 (diff) | |
| download | deployment-eb56fbfaa78bdf6bee0db7d020e03b79fedc1741.tar.gz deployment-eb56fbfaa78bdf6bee0db7d020e03b79fedc1741.tar.bz2 deployment-eb56fbfaa78bdf6bee0db7d020e03b79fedc1741.zip | |
fix #6579: do not have two entries in config for the same exchange
Diffstat (limited to 'bin/taler-config-generate')
| -rwxr-xr-x | bin/taler-config-generate | 13 |
1 files 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") |