diff options
| author | Christian Grothoff <christian@grothoff.org> | 2020-06-03 11:14:35 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2020-06-03 11:14:35 +0200 |
| commit | ec0fd5d39f8fc13f771c9daece98ac3e60e46ed0 (patch) | |
| tree | 831e0c4e3e7df7ced120d42c7d6407419da99a4f /bin/taler-config-generate | |
| parent | 0bdb35317ad118a6e57ef6c412f58d0c3b6c7f16 (diff) | |
| parent | 519a3a9b6606029e28b0ec424284461fdab206dd (diff) | |
| download | deployment-ec0fd5d39f8fc13f771c9daece98ac3e60e46ed0.tar.gz deployment-ec0fd5d39f8fc13f771c9daece98ac3e60e46ed0.tar.bz2 deployment-ec0fd5d39f8fc13f771c9daece98ac3e60e46ed0.zip | |
merge
Diffstat (limited to 'bin/taler-config-generate')
| -rwxr-xr-x | bin/taler-config-generate | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/bin/taler-config-generate b/bin/taler-config-generate index 54a4012..33ac4a6 100755 --- 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") @@ -148,7 +147,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)) @@ -244,12 +243,10 @@ def config(obj): obj.cfg_put("merchant-account-merchant", "wire_response", "${TALER_DATA_HOME}/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") + merchant_instance_names = ("default", "Tor", "GNUnet", "Taler", "FSF", "Tutorial") + for mi in merchant_instance_names: + obj.cfg_put("merchant-account-merchant", f"HONOR_{mi}", "YES") + obj.cfg_put("merchant-account-merchant", f"ACTIVE_{mi}", "YES") coin(obj, "ct_10", "0.10") coin(obj, "1", "1") |