summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-09-16 10:04:26 +0200
committerChristian Grothoff <christian@grothoff.org>2016-09-16 10:04:26 +0200
commit1d8e1052ddfc57c646c2d9ae2d3a315bbfa14aa0 (patch)
tree1726a10d4a67b5111abba27e5927693312fbe01a /config
parent791a4e2e03c0ac2e9ee7eac3e4024840dc56ccbb (diff)
downloaddeployment-1d8e1052ddfc57c646c2d9ae2d3a315bbfa14aa0.tar.gz
deployment-1d8e1052ddfc57c646c2d9ae2d3a315bbfa14aa0.tar.bz2
deployment-1d8e1052ddfc57c646c2d9ae2d3a315bbfa14aa0.zip
move deployment-specific configuration to deployment
Diffstat (limited to 'config')
-rw-r--r--config/demo.taler.net/taler.conf21
-rw-r--r--config/test.taler.net/taler.conf21
2 files changed, 42 insertions, 0 deletions
diff --git a/config/demo.taler.net/taler.conf b/config/demo.taler.net/taler.conf
index c3e194e..4e93776 100644
--- 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
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