[taler-deployment] branch master updated: fix merchant config

[gnunet]

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

dold pushed a commit to branch master
in repository deployment.

The following commit(s) were added to refs/heads/master by this push:
     new 31d172d  fix merchant config
31d172d is described below

commit 31d172d15a8867027e50c11ce44eabe12c084305
Author: Florian Dold <address@hidden>
AuthorDate: Tue Jan 21 18:01:56 2020 +0100

    fix merchant config
---
 config/generate-config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/generate-config b/config/generate-config
index 18a4ddf..651763f 100755
--- a/config/generate-config
+++ b/config/generate-config
@@ -248,9 +248,9 @@ def config(obj):
     obj.cfg_put("instance-Tutorial", "name", "Tutorial")
 
     if "demo" != obj.envname and obj.twisted:
-        obj.cfg_put("account-merchant", "payto_uri", 
"payto://x-taler-bank/twister-bank.taler.net/Tutorial")
+        obj.cfg_put("merchant-account-merchant", "payto_uri", 
"payto://x-taler-bank/twister-bank.taler.net/Tutorial")
     else:
-        obj.cfg_put("account-merchant", "payto_uri", 
"payto://x-taler-bank/bank.{}.taler.net/Tutorial".format(obj.envname))
+        obj.cfg_put("merchant-account-merchant", "payto_uri", 
"payto://x-taler-bank/bank.{}.taler.net/Tutorial".format(obj.envname))
 
     obj.cfg_put("merchant-account-merchant", "wire_response", 
"${TALER_DEPLOYMENT_DATA}/merchant/wire/merchant.json")
     obj.cfg_put("merchant-account-merchant", "wire_file_mode", "770")

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