commit f9cee56e38c68f13a3534b1db86110827f3151c4
parent 63241b1c41cdd2702994dd651d7e1005e9061109
Author: Marcello Stanisci <stanisci.m@gmail.com>
Date: Fri, 27 Oct 2017 11:09:27 +0200
fix amount format
Diffstat:
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/config/generate-config b/config/generate-config
@@ -78,8 +78,8 @@ def config(currency, envname, exchange_pub, standalone):
cfg_put("merchant", "serve", "unix")
cfg_put("merchant", "unixpath", "$HOME/sockets/merchant.http")
cfg_put("merchant", "wire_transfer_delay", "1 m")
- cfg_put("merchant", "default_max_wire_fee", "0.01")
- cfg_put("merchant", "default_max_deposit_fee", "0.05")
+ cfg_put("merchant", "default_max_wire_fee", currency + ":" + "0.01")
+ cfg_put("merchant", "default_max_deposit_fee", currency + ":" + "0.05")
if standalone:
cfg_put("merchantdb-postgres", "config", "postgres:///taler?host={}/sockets".format(os.getenv("HOME")))
@@ -87,18 +87,18 @@ def config(currency, envname, exchange_pub, standalone):
cfg_put("merchantdb-postgres", "config", "postgres:///taler{}".format(envname))
if standalone:
- cfg_put("merchant-exchange-test", "URI", "https://env.taler.net/{}/exchange/".format(envname))
+ cfg_put("merchant-exchange-test", "uri", "https://env.taler.net/{}/exchange/".format(envname))
else:
- cfg_put("merchant-exchange-test", "URI", "https://exchange.{}.taler.net/".format(envname))
+ cfg_put("merchant-exchange-test", "uri", "https://exchange.{}.taler.net/".format(envname))
- cfg_put("merchant-exchange-test", "MASTER_KEY", exchange_pub)
+ cfg_put("merchant-exchange-test", "master_key", exchange_pub)
if standalone:
- cfg_put("frontends", "BACKEND", "https://env.taler.net/{}/merchant-backend/".format(envname))
+ cfg_put("frontends", "backend", "https://env.taler.net/{}/merchant-backend/".format(envname))
else:
- cfg_put("frontends", "BACKEND", "https://shop.{}.taler.net/backend/".format(envname))
+ cfg_put("frontends", "backend", "https://shop.{}.taler.net/backend/".format(envname))
- cfg_put("frontends", "FRACTION", "100000000")
+ cfg_put("frontends", "fraction", "100000000")
cfg_put("auditor", "auditor_priv_file", "${TALER_DEPLOYMENT_SHARED}/auditor/offline-keys/auditor.priv")