6 files changed, 34 insertions, 10 deletions
diff --git a/config/demo.taler.net/taler.conf b/config/demo.taler.net/taler.conf
index 51f9e30..0c357ab 100644
--- a/config/demo.taler.net/taler.conf
+++ b/config/demo.taler.net/taler.conf
@@ -20,6 +20,7 @@ uwsgi_unixpath = $HOME/sockets/donations.uwsgi
 [blog]
 uwsgi_serve = unix
 uwsgi_unixpath = $HOME/sockets/blog.uwsgi
+instance = FSF
 
 
 [merchant]
@@ -163,7 +164,6 @@ fee_refund = KUDOS:0.01
 rsa_keysize = 2048
 
 
-
 [merchant-instance-wireformat-Tor]
 TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/tor.json
 
@@ -173,6 +173,8 @@ 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-wireformat-FSF]
+TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/fsf.json
 
 [merchant-instance-Tor]
 KEYFILE = ${TALER_DATA_HOME}/merchant/tor.priv
@@ -182,3 +184,6 @@ 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
diff --git a/config/demo.taler.net/taler/merchant/wire/test.json b/config/demo.taler.net/taler/merchant/wire/fsf.json
index 0a2126e..0a2126e 100644
--- a/config/demo.taler.net/taler/merchant/wire/test.json
+++ b/config/demo.taler.net/taler/merchant/wire/fsf.json
diff --git a/config/demo.taler.net/taler/merchant/wire/tutorial.json b/config/demo.taler.net/taler/merchant/wire/tutorial.json
new file mode 100644
index 0000000..c37fb38
--- /dev/null
+++ b/config/demo.taler.net/taler/merchant/wire/tutorial.json
@@ -0,0 +1,7 @@
+{
+  "type": "test",
+  "bank_uri": "https://bank.demo.taler.net/",
+  "sig": "MERCHANTSIGNATURE",
+  "account_number": 7,
+  "salt": "SALT"
+}
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/test.json b/config/test.taler.net/taler/merchant/wire/fsf.json
index 3d62dc5..3d62dc5 100644
--- a/config/test.taler.net/taler/merchant/wire/test.json
+++ b/config/test.taler.net/taler/merchant/wire/fsf.json
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"
+}