summaryrefslogtreecommitdiff
path: root/config/test.taler.net/taler.conf
diff options
context:
space:
mode:
Diffstat (limited to 'config/test.taler.net/taler.conf')
-rw-r--r--config/test.taler.net/taler.conf23
1 files changed, 14 insertions, 9 deletions
diff --git a/config/test.taler.net/taler.conf b/config/test.taler.net/taler.conf
index 04cd3ea..6c4218c 100644
--- a/config/test.taler.net/taler.conf
+++ b/config/test.taler.net/taler.conf
@@ -26,6 +26,7 @@ uwsgi_unixpath = $HOME/sockets/donations.uwsgi
[blog]
uwsgi_serve = unix
uwsgi_unixpath = $HOME/sockets/blog.uwsgi
+instance = FSF
[merchant]
@@ -170,6 +171,17 @@ fee_refund = PUDOS:0.01
rsa_keysize = 2048
+[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
+
+[merchant-instance-FSF]
+KEYFILE = ${TALER_DATA_HOME}/merchant/fsf.priv
[merchant-instance-wireformat-Tor]
TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/tor.json
@@ -180,12 +192,5 @@ TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/gnunet.json
[merchant-instance-wireformat-Taler]
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
+[merchant-instance-wireformat-FSF]
+TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/fsf.json