From e3213c24b421dd90f32b2c358ecadf7166257d6a Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Tue, 26 Apr 2016 18:00:38 +0200
Subject: go back to HOME based configs again

---
 config/test.taler.net/taler.conf | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

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

diff --git a/config/test.taler.net/taler.conf b/config/test.taler.net/taler.conf
index 5e4e33a..ee418de 100644
--- a/config/test.taler.net/taler.conf
+++ b/config/test.taler.net/taler.conf
@@ -1,65 +1,67 @@
 [paths]
-TALER_CONFIG_HOME = ${TALER_DEPLOYMENT_BASE:-$HOME}/config/taler
-# data that is shared across all deployments on e.g. one account
 TALER_DEPLOYMENT_SHARED = ${HOME}/shared-data
 
+
 [taler]
 CURRENCY = PUDOS
 
+
 [bank]
 uwsgi_serve = unix
-uwsgi_unixpath = ${TALER_DEPLOYMENT_BASE:-$HOME}/sockets/bank.uwsgi
+uwsgi_unixpath = $HOME/sockets/bank.uwsgi
 database = talerbank
 
 
 [donations]
 uwsgi_serve = unix
-uwsgi_unixpath = ${TALER_DEPLOYMENT_BASE:-$HOME}/sockets/donations.uwsgi
+uwsgi_unixpath = $HOME/sockets/donations.uwsgi
+
 
 [blog]
 uwsgi_serve = unix
-uwsgi_unixpath = ${TALER_DEPLOYMENT_BASE:-$HOME}/sockets/blog.uwsgi
+uwsgi_unixpath = $HOME/sockets/blog.uwsgi
+
 
 [merchant]
 WIREFORMAT = test
 SERVE = unix
-UNIXPATH = ${TALER_DEPLOYMENT_BASE:-$HOME}/sockets/merchant.http
+UNIXPATH = $HOME/sockets/merchant.http
 KEYFILE = ${TALER_DEPLOYMENT_SHARED}/merchant/merchant.priv
+EDATE = 3 week
 
-[merchant-wireformat]
-BANK_URI = https://bank.test.taler.net/
-BANK_ACCOUNT_NUMBER = 3
-TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/test.json
 
 [merchantdb-postgres]
 CONFIG = postgres:///talertest
 
+
 [merchant-exchange-test]
 URI = https://exchange.test.taler.net/
 MASTER_KEY = CQQZ9DY3MZ1ARMN5K1VKDETS04Y2QCKMMCFHZSWJWWVN82BTTH00
 
+
 [frontends]
 BACKEND = https://shop.test.taler.net/backend/
 
+
 [exchange]
 SERVE = unix
-UNIXPATH = ${TALER_DEPLOYMENT_BASE:-$HOME}/sockets/exchange.http
-
-KEYDIR = ${TALER_DEPLOYMENT_SHARED:-$HOME}/exchange/live-keys/
+UNIXPATH = $HOME/sockets/exchange.http
 MASTER_PRIV_FILE = ${TALER_DEPLOYMENT_SHARED}/exchange/offline-keys/master.priv
-
 MASTER_PUBLIC_KEY = CQQZ9DY3MZ1ARMN5K1VKDETS04Y2QCKMMCFHZSWJWWVN82BTTH00
 WIREFORMAT = test
 TESTRUN = YES
 
+
 [exchangedb-postgres]
 DB_CONN_STR = "postgres:///talertest"
 
+
 [exchange-wire-outgoing-test]
 BANK_URI = https://bank.test.taler.net/
 BANK_ACCOUNT_NUMBER = 1
 EXCHANGE_ACCOUNT_NUMBER = 2
 
+
 [exchange_keys]
 # how long is one signkey valid?
 signkey_duration = 18 weeks
@@ -75,8 +77,6 @@ lookahead_sign = 32 weeks 1 day
 # ahead of time?
 lookahead_provide = 4 weeks 1 day
 
-[merchant]
-EDATE = 3 week
 
 # Coin definitions are detected because the section
 # name begins with "coin_".  The rest of the
@@ -107,6 +107,7 @@ fee_refresh = PUDOS:0.01
 fee_refund = PUDOS:0.01
 rsa_keysize = 1024
 
+
 [coin_pudos_2]
 value = PUDOS:2
 duration_overlap = 5 minutes
@@ -119,6 +120,7 @@ fee_refresh = PUDOS:0.01
 fee_refund = PUDOS:0.01
 rsa_keysize = 1024
 
+
 [coin_pudos_5]
 value = PUDOS:5
 duration_overlap = 5 minutes
@@ -131,6 +133,7 @@ fee_refresh = PUDOS:0.01
 fee_refund = PUDOS:0.01
 rsa_keysize = 1024
 
+
 [coin_pudos_10]
 value = PUDOS:10
 duration_overlap = 5 minutes
@@ -143,6 +146,7 @@ fee_refresh = PUDOS:0.01
 fee_refund = PUDOS:0.01
 rsa_keysize = 1024
 
+
 [coin_pudos_1000]
 value = PUDOS:1000
 duration_overlap = 5 minutes
-- 
cgit v1.2.3