summaryrefslogtreecommitdiff
path: root/config/test.taler.net
diff options
context:
space:
mode:
authorMarcello Stanisci <marcello.stanisci@inria.fr>2016-11-16 14:56:07 +0100
committerMarcello Stanisci <marcello.stanisci@inria.fr>2016-11-16 14:56:07 +0100
commit0ce9948bd919cabd160521e496ad9029a122f364 (patch)
tree5af61d8566d49004efae8f60c70ed25d12787658 /config/test.taler.net
parentf9a7134a5c4a9fa3de5ece4966dc5e1f208f2b86 (diff)
downloaddeployment-0ce9948bd919cabd160521e496ad9029a122f364.tar.gz
deployment-0ce9948bd919cabd160521e496ad9029a122f364.tar.bz2
deployment-0ce9948bd919cabd160521e496ad9029a122f364.zip
'Tutorial' is the default merchant instance. Blog points to FSF instance.
Diffstat (limited to 'config/test.taler.net')
-rw-r--r--config/test.taler.net/taler.conf23
-rw-r--r--config/test.taler.net/taler/merchant/wire/fsf.json (renamed from config/test.taler.net/taler/merchant/wire/test.json)0
-rw-r--r--config/test.taler.net/taler/merchant/wire/tutorial.json7
3 files changed, 21 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
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"
+}