From 1d8e1052ddfc57c646c2d9ae2d3a315bbfa14aa0 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 16 Sep 2016 10:04:26 +0200
Subject: move deployment-specific configuration to deployment

---
 config/test.taler.net/taler.conf | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'config/test.taler.net')

diff --git a/config/test.taler.net/taler.conf b/config/test.taler.net/taler.conf
index a559caf..245272a 100644
--- 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
-- 
cgit v1.2.3