commit 85bb5aedc1502ecc7b10f96213cc2dee7639708f parent e2f5e1bb49013c3576b82f11b32654327605d437 Author: Marcello Stanisci <marcello.stanisci@inria.fr> Date: Sat, 17 Sep 2016 17:13:51 +0200 Merge branch 'master' of ssh://taler.net/var/git/deployment Diffstat:
| M | config/demo.taler.net/taler.conf | | | 21 | +++++++++++++++++++++ |
| M | config/test.taler.net/taler.conf | | | 21 | +++++++++++++++++++++ |
2 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/config/demo.taler.net/taler.conf b/config/demo.taler.net/taler.conf @@ -158,3 +158,24 @@ fee_deposit = KUDOS:0.01 fee_refresh = KUDOS:0.01 fee_refund = KUDOS:0.01 rsa_keysize = 2048 + + + +[Tor-wireformat] +TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/tor.json + +[GNUnet-wireformat] +TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/gnunet.json + +[Taler-wireformat] +TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/taler.json + + +[merchant-instance-Tor] +KEYFILE = ${TALER_DATA_HOME}/merchant/tor.priv + +[merchant-instance-GNUnet] +KEYFILE = ${TALER_DATA_HOME}/merchant/gnunet.priv + +[merchant-instance-Taler] +KEYFILE = ${TALER_DATA_HOME}/merchant/taler.priv diff --git a/config/test.taler.net/taler.conf b/config/test.taler.net/taler.conf @@ -161,3 +161,24 @@ fee_deposit = PUDOS:0.01 fee_refresh = PUDOS:0.01 fee_refund = PUDOS:0.01 rsa_keysize = 2048 + + + +[Tor-wireformat] +TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/tor.json + +[GNUnet-wireformat] +TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/gnunet.json + +[Taler-wireformat] +TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/taler.json + + +[merchant-instance-Tor] +KEYFILE = ${TALER_DATA_HOME}/merchant/tor.priv + +[merchant-instance-GNUnet] +KEYFILE = ${TALER_DATA_HOME}/merchant/gnunet.priv + +[merchant-instance-Taler] +KEYFILE = ${TALER_DATA_HOME}/merchant/taler.priv