From 0ce9948bd919cabd160521e496ad9029a122f364 Mon Sep 17 00:00:00 2001
From: Marcello Stanisci <marcello.stanisci@inria.fr>
Date: Wed, 16 Nov 2016 14:56:07 +0100
Subject: 'Tutorial' is the default merchant instance. Blog points to FSF
 instance.

---
 config/test.taler.net/taler.conf                   | 23 +++++++++++++---------
 config/test.taler.net/taler/merchant/wire/fsf.json |  7 +++++++
 .../test.taler.net/taler/merchant/wire/test.json   |  7 -------
 .../taler/merchant/wire/tutorial.json              |  7 +++++++
 4 files changed, 28 insertions(+), 16 deletions(-)
 create mode 100644 config/test.taler.net/taler/merchant/wire/fsf.json
 delete mode 100644 config/test.taler.net/taler/merchant/wire/test.json
 create mode 100644 config/test.taler.net/taler/merchant/wire/tutorial.json

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

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
diff --git a/config/test.taler.net/taler/merchant/wire/fsf.json b/config/test.taler.net/taler/merchant/wire/fsf.json
new file mode 100644
index 0000000..3d62dc5
--- /dev/null
+++ b/config/test.taler.net/taler/merchant/wire/fsf.json
@@ -0,0 +1,7 @@
+{
+  "type": "test",
+  "bank_uri": "https://bank.test.taler.net/",
+  "sig": "MERCHANTSIGNATURE",
+  "account_number": 6,
+  "salt": "SALT"
+}
diff --git a/config/test.taler.net/taler/merchant/wire/test.json b/config/test.taler.net/taler/merchant/wire/test.json
deleted file mode 100644
index 3d62dc5..0000000
--- a/config/test.taler.net/taler/merchant/wire/test.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "type": "test",
-  "bank_uri": "https://bank.test.taler.net/",
-  "sig": "MERCHANTSIGNATURE",
-  "account_number": 6,
-  "salt": "SALT"
-}
diff --git a/config/test.taler.net/taler/merchant/wire/tutorial.json b/config/test.taler.net/taler/merchant/wire/tutorial.json
new file mode 100644
index 0000000..700322d
--- /dev/null
+++ b/config/test.taler.net/taler/merchant/wire/tutorial.json
@@ -0,0 +1,7 @@
+{
+  "type": "test",
+  "bank_uri": "https://bank.test.taler.net/",
+  "sig": "MERCHANTSIGNATURE",
+  "account_number": 7,
+  "salt": "SALT"
+}
-- 
cgit v1.2.3