diff options
| author | Marcello Stanisci <stanisci.m@gmail.com> | 2018-04-26 13:02:14 +0200 |
|---|---|---|
| committer | Marcello Stanisci <stanisci.m@gmail.com> | 2018-04-26 13:02:14 +0200 |
| commit | e68d13981813b1f7bd0ff06a0e9a8a03fa700389 (patch) | |
| tree | 371313c05baf6001cb80ac1d8b01cb415744bfb2 /config | |
| parent | 83d5b2782a02a825ddcd0fe593ec9467d6037dfe (diff) | |
| download | deployment-e68d13981813b1f7bd0ff06a0e9a8a03fa700389.tar.gz deployment-e68d13981813b1f7bd0ff06a0e9a8a03fa700389.tar.bz2 deployment-e68d13981813b1f7bd0ff06a0e9a8a03fa700389.zip | |
merchant-instance-* => instance-*
Diffstat (limited to 'config')
| -rwxr-xr-x | config/generate-config | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/config/generate-config b/config/generate-config index 07bf864..e42c7af 100755 --- a/config/generate-config +++ b/config/generate-config @@ -194,36 +194,36 @@ 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") + cfg_put("instance-FSF", "keyfile", "${TALER_DEPLOYMENT_SHARED}/merchant/fsf.priv") + cfg_put("instance-FSF", "name", "Free Software Foundation") cfg_put("merchant-location-FSF-address", "street", "51 Franklin Street, Fifth Floor.") cfg_put("merchant-location-FSF-address", "city", "Boston") cfg_put("merchant-location-FSF-address", "country", "USA") # instance Tor - cfg_put("merchant-instance-Tor", "keyfile", "${TALER_DEPLOYMENT_SHARED}/merchant/tor.priv") - cfg_put("merchant-instance-Tor", "name", "The Tor Project") + cfg_put("instance-Tor", "keyfile", "${TALER_DEPLOYMENT_SHARED}/merchant/tor.priv") + cfg_put("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") + cfg_put("instance-GNUnet", "keyfile", "${TALER_DEPLOYMENT_SHARED}/merchant/gnunet.priv") + cfg_put("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") + cfg_put("instance-Taler", "keyfile", "${TALER_DEPLOYMENT_SHARED}/merchant/taler.priv") + cfg_put("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("instance-default", "keyfile", "${TALER_DEPLOYMENT_SHARED}/merchant/default.priv") + cfg_put("instance-default", "name", "Kudos Inc.") cfg_put("merchant-location-default-address", "country", "Kudosland") - 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)) + cfg_put("instance-default", "tip_reserve_priv_filename", "${TALER_DEPLOYMENT_SHARED}/merchant/default-tip.priv") + cfg_put("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") - 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("instance-tutorial", "keyfile", "${TALER_DEPLOYMENT_SHARED}/merchant/tutorial.priv") + cfg_put("instance-tutorial", "name", "Tutorial") + + cfg_put("instance-wireformat-Tor", "test_response_file", "${TALER_DEPLOYMENT_SHARED}/merchant/wire/tor.json") + cfg_put("instance-wireformat-GNUnet", "test_response_file", "${TALER_DEPLOYMENT_SHARED}/merchant/wire/gnunet.json") + cfg_put("instance-wireformat-Taler", "test_response_file", "${TALER_DEPLOYMENT_SHARED}/merchant/wire/taler.json") + cfg_put("instance-wireformat-FSF", "test_response_file", "${TALER_DEPLOYMENT_SHARED}/merchant/wire/fsf.json") + cfg_put("instance-wireformat-default", "test_response_file", "${TALER_DEPLOYMENT_SHARED}/merchant/wire/default.json") + cfg_put("instance-wireformat-tutorial", "test_response_file", "${TALER_DEPLOYMENT_SHARED}/merchant/wire/default.json") coin(currency, "ct_10", "0.10") coin(currency, "1", "1") |