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

---
 src/backend/merchant.conf | 18 ------------------
 1 file changed, 18 deletions(-)

(limited to 'src')

diff --git a/src/backend/merchant.conf b/src/backend/merchant.conf
index 90ed9143..71ca5c74 100644
--- a/src/backend/merchant.conf
+++ b/src/backend/merchant.conf
@@ -33,23 +33,5 @@ CONFIG = postgres:///talermerchant
 [merchant-instance-default]
 KEYFILE = ${TALER_DATA_HOME}/merchant/merchant.priv
 
-[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
-
 [default-wireformat]
 TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/test.json
-
-[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
-- 
cgit v1.2.3