commit d78b8125f45fe8a6d41b1a16e7d9bb68900d90d3
parent 6beff584ac1a0cd7b37920444fecd36e847854c3
Author: root <root@taler.net>
Date: Mon, 26 Sep 2016 17:28:42 +0200
Merge branch 'master' of /var/git/deployment
Diffstat:
8 files changed, 64 insertions(+), 2 deletions(-)
diff --git 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
@@ -26,6 +26,7 @@ uwsgi_unixpath = $HOME/sockets/blog.uwsgi
WIREFORMAT = test
SERVE = unix
UNIXPATH = $HOME/sockets/merchant.http
+# WARNING: The following line may be obsolete.
KEYFILE = ${TALER_DEPLOYMENT_SHARED}/merchant/merchant.priv
WIRE_TRANSFER_DELAY = 1 m
@@ -161,3 +162,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
diff --git a/config/test.taler.net/taler/merchant/wire/gnunet.json b/config/test.taler.net/taler/merchant/wire/gnunet.json
@@ -0,0 +1,7 @@
+{
+ "type": "test",
+ "bank_uri": "https://bank.test.taler.net/",
+ "sig": "MERCHANTSIGNATURE",
+ "account_number": 4,
+ "salt": "SALT"
+}
diff --git a/config/test.taler.net/taler/merchant/wire/taler.json b/config/test.taler.net/taler/merchant/wire/taler.json
@@ -0,0 +1,7 @@
+{
+ "type": "test",
+ "bank_uri": "https://bank.test.taler.net/",
+ "sig": "MERCHANTSIGNATURE",
+ "account_number": 5,
+ "salt": "SALT"
+}
diff --git a/config/test.taler.net/taler/merchant/wire/test.json b/config/test.taler.net/taler/merchant/wire/test.json
@@ -2,6 +2,6 @@
"type": "test",
"bank_uri": "https://bank.test.taler.net/",
"sig": "MERCHANTSIGNATURE",
- "account_number": 24,
+ "account_number": 6,
"salt": "SALT"
}
diff --git a/config/test.taler.net/taler/merchant/wire/tor.json b/config/test.taler.net/taler/merchant/wire/tor.json
@@ -2,6 +2,6 @@
"type": "test",
"bank_uri": "https://bank.test.taler.net/",
"sig": "MERCHANTSIGNATURE",
- "account_number": 25,
+ "account_number": 3,
"salt": "SALT"
}
diff --git a/taler-arm/defaults.conf b/taler-arm/defaults.conf
@@ -14,3 +14,7 @@ GNUNET_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/gnunet-system-runtime/
# Runtime data for per-user services
GNUNET_USER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/gnunet-${USERHOME:-${USER:-user}}-runtime/
+
+[arm]
+# FIXME: does this work? (if not, need to fix arm_api.c...)
+OPTIONS = -l $HOME/logs/arm-%Y-%m-%d.log
diff --git a/taler-arm/taler-aggregator.conf b/taler-arm/taler-aggregator.conf
@@ -1,3 +1,4 @@
[taler-aggregator]
TYPE = simple
BINARY = taler-exchange-aggregator
+OPTIONS = -l $HOME/logs/aggregator-%Y-%m-%d.log
