[GNUnet-SVN] [taler-deployment] branch master updated: add name field for merchant instances

[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 9471050  add name field for merchant instances
9471050 is described below

commit 947105031dd806fe3c9dd6a3fb45633a059d292b
Author: Florian Dold <address@hidden>
AuthorDate: Wed Jan 10 17:23:01 2018 +0100

    add name field for merchant instances
---
 config/generate-config | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/config/generate-config b/config/generate-config
index 459c45b..33c8167 100755
--- a/config/generate-config
+++ b/config/generate-config
@@ -188,15 +188,26 @@ def config(currency, envname, exchange_pub, standalone):
 
     cfg_put("exchange_keys", "lookahead_provide", "4 weeks 1 day")
 
-
+    # instance FSF
     cfg_put("merchant-instance-FSF", "keyfile", 
"${TALER_DEPLOYMENT_SHARED}/merchant/fsf.priv")
+    cfg_put("merchant-instance-FSF", "name", "Free Software Foundation")
+    # instance Tor
     cfg_put("merchant-instance-Tor", "keyfile", 
"${TALER_DEPLOYMENT_SHARED}/merchant/tor.priv")
+    cfg_put("merchant-instance-Tor", "name", "The Tor Project")
+    # instance GNUnet
     cfg_put("merchant-instance-GNUnet", "keyfile", 
"${TALER_DEPLOYMENT_SHARED}/merchant/gnunet.priv")
+    cfg_put("merchant-instance-GNUnet", "name", "GNUnet Project")
+    # instance Taler
     cfg_put("merchant-instance-Taler", "keyfile", 
"${TALER_DEPLOYMENT_SHARED}/merchant/taler.priv")
+    cfg_put("merchant-instance-Taler", "name", "Taler")
+    # instance default
     cfg_put("merchant-instance-default", "keyfile", 
"${TALER_DEPLOYMENT_SHARED}/merchant/default.priv")
+    cfg_put("merchant-instance-default", "name", "Kudos Inc.")
     cfg_put("merchant-instance-default", "tip_reserve_priv_filename", 
"${TALER_DEPLOYMENT_SHARED}/merchant/default-tip.priv")
     cfg_put("merchant-instance-default", "tip_exchange", 
"https://exchange.{}.taler.net/".format(envname))
+    # instance tutorial
     cfg_put("merchant-instance-tutorial", "keyfile", 
"${TALER_DEPLOYMENT_SHARED}/merchant/tutorial.priv")
+    cfg_put("merchant-instance-tutorial", "name", "Tutorial")
 
     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")

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