[GNUnet-SVN] [taler-deployment] branch master updated: max wire and deposit fee into config

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository deployment.

The following commit(s) were added to refs/heads/master by this push:
     new 63241b1  max wire and deposit fee into config
63241b1 is described below

commit 63241b1c41cdd2702994dd651d7e1005e9061109
Author: Marcello Stanisci <address@hidden>
AuthorDate: Fri Oct 27 10:56:02 2017 +0200

    max wire and deposit fee into config
---
 config/generate-config | 42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/config/generate-config b/config/generate-config
index 90f9184..c4ef05c 100755
--- a/config/generate-config
+++ b/config/generate-config
@@ -74,10 +74,12 @@ def config(currency, envname, exchange_pub, standalone):
     cfg_put("blog", "uwsgi_unixpath", "$HOME/sockets/shop.uwsgi")
     cfg_put("blog", "instance", "FSF")
 
-    cfg_put("merchant", "WIREFORMAT", "test")
-    cfg_put("merchant", "SERVE", "unix")
-    cfg_put("merchant", "UNIXPATH", "$HOME/sockets/merchant.http")
-    cfg_put("merchant", "WIRE_TRANSFER_DELAY", "1 m")
+    cfg_put("merchant", "wireformat", "test")
+    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")
 
     if standalone:
         cfg_put("merchantdb-postgres", "config", 
"postgres:///taler?host={}/sockets".format(os.getenv("HOME")))
@@ -105,13 +107,13 @@ def config(currency, envname, exchange_pub, standalone):
     cfg_put("exchange", "unixpath", "$HOME/sockets/exchange.http")
     cfg_put("exchange", "master_public_key", exchange_pub)
 
-    cfg_put("exchange", "MASTER_PRIV_FILE", 
"${TALER_DEPLOYMENT_SHARED}/exchange/offline-keys/master.priv")
+    cfg_put("exchange", "master_priv_file", 
"${TALER_DEPLOYMENT_SHARED}/exchange/offline-keys/master.priv")
     cfg_put("exchange", "keydir", 
"${TALER_DEPLOYMENT_SHARED}/exchange/live-keys/")
 
-    cfg_put("exchange-admin", "SERVE", "unix")
+    cfg_put("exchange-admin", "serve", "unix")
     cfg_put("exchange-admin", "unixpath", "$HOME/sockets/exchange-admin.http")
-    cfg_put("exchangedb", "AUDITOR_BASE_DIR", 
"${TALER_DEPLOYMENT_SHARED}/exchange/auditors/")
-    cfg_put("exchangedb", "WIREFEE_BASE_DIR", 
"${TALER_DEPLOYMENT_SHARED}/exchange/wirefees/")
+    cfg_put("exchangedb", "auditor_base_dir", 
"${TALER_DEPLOYMENT_SHARED}/exchange/auditors/")
+    cfg_put("exchangedb", "wirefee_base_dir", 
"${TALER_DEPLOYMENT_SHARED}/exchange/wirefees/")
 
     if standalone:
         cfg_put("exchangedb-postgres", "db_conn_str", 
"postgres:///taler?host={}/sockets".format(os.getenv("HOME")))
@@ -166,19 +168,19 @@ def config(currency, envname, exchange_pub, standalone):
     cfg_put("exchange_keys", "lookahead_provide", "4 weeks 1 day")
 
 
-    cfg_put("merchant-instance-FSF", "KEYFILE", 
"${TALER_DEPLOYMENT_SHARED}/merchant/fsf.priv")
-    cfg_put("merchant-instance-Tor", "KEYFILE", 
"${TALER_DEPLOYMENT_SHARED}/merchant/tor.priv")
-    cfg_put("merchant-instance-GNUnet", "KEYFILE", 
"${TALER_DEPLOYMENT_SHARED}/merchant/gnunet.priv")
-    cfg_put("merchant-instance-Taler", "KEYFILE", 
"${TALER_DEPLOYMENT_SHARED}/merchant/taler.priv")
-    cfg_put("merchant-instance-default", "KEYFILE", 
"${TALER_DEPLOYMENT_SHARED}/merchant/default.priv")
-    cfg_put("merchant-instance-tutorial", "KEYFILE", 
"${TALER_DEPLOYMENT_SHARED}/merchant/tutorial.priv")
+    cfg_put("merchant-instance-FSF", "keyfile", 
"${TALER_DEPLOYMENT_SHARED}/merchant/fsf.priv")
+    cfg_put("merchant-instance-Tor", "keyfile", 
"${TALER_DEPLOYMENT_SHARED}/merchant/tor.priv")
+    cfg_put("merchant-instance-GNUnet", "keyfile", 
"${TALER_DEPLOYMENT_SHARED}/merchant/gnunet.priv")
+    cfg_put("merchant-instance-Taler", "keyfile", 
"${TALER_DEPLOYMENT_SHARED}/merchant/taler.priv")
+    cfg_put("merchant-instance-default", "keyfile", 
"${TALER_DEPLOYMENT_SHARED}/merchant/default.priv")
+    cfg_put("merchant-instance-tutorial", "keyfile", 
"${TALER_DEPLOYMENT_SHARED}/merchant/tutorial.priv")
 
-    cfg_put("merchant-instance-wireformat-Tor", "TEST_RESPONSE_FILE", 
"${TALER_DEPLOYMENT_SHARED}/merchant/wire/tor.json")
-    cfg_put("merchant-instance-wireformat-GNUnet", "TEST_RESPONSE_FILE", 
"${TALER_DEPLOYMENT_SHARED}/merchant/wire/gnunet.json")
-    cfg_put("merchant-instance-wireformat-Taler", "TEST_RESPONSE_FILE", 
"${TALER_DEPLOYMENT_SHARED}/merchant/wire/taler.json")
-    cfg_put("merchant-instance-wireformat-FSF", "TEST_RESPONSE_FILE", 
"${TALER_DEPLOYMENT_SHARED}/merchant/wire/fsf.json")
-    cfg_put("merchant-instance-wireformat-default", "TEST_RESPONSE_FILE", 
"${TALER_DEPLOYMENT_SHARED}/merchant/wire/default.json")
-    cfg_put("merchant-instance-wireformat-tutorial", "TEST_RESPONSE_FILE", 
"${TALER_DEPLOYMENT_SHARED}/merchant/wire/default.json")
+    cfg_put("merchant-instance-wireformat-Tor", "test_response_file", 
"${TALER_DEPLOYMENT_SHARED}/merchant/wire/tor.json")
+    cfg_put("merchant-instance-wireformat-GNUnet", "test_response_file", 
"${TALER_DEPLOYMENT_SHARED}/merchant/wire/gnunet.json")
+    cfg_put("merchant-instance-wireformat-Taler", "test_response_file", 
"${TALER_DEPLOYMENT_SHARED}/merchant/wire/taler.json")
+    cfg_put("merchant-instance-wireformat-FSF", "test_response_file", 
"${TALER_DEPLOYMENT_SHARED}/merchant/wire/fsf.json")
+    cfg_put("merchant-instance-wireformat-default", "test_response_file", 
"${TALER_DEPLOYMENT_SHARED}/merchant/wire/default.json")
+    cfg_put("merchant-instance-wireformat-tutorial", "test_response_file", 
"${TALER_DEPLOYMENT_SHARED}/merchant/wire/default.json")
 
     coin(currency, "ct_10", "0.10")
     coin(currency, "1", "1")

-- 
To stop receiving notification emails like this one, please contact
address@hidden