From ac1923acee7057df71fb55446e5ab4ec6de49e60 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Tue, 26 Apr 2016 01:43:02 +0200
Subject: deployment conf

---
 bootstrap                        | 6 ++++--
 config/test.taler.net/taler.conf | 9 +++++++++
 taler-arm/taler-blog.conf        | 2 +-
 taler-arm/taler-demobank.conf    | 2 +-
 taler-arm/taler-donations.conf   | 2 +-
 taler-arm/taler-exchange.conf    | 1 +
 taler-arm/taler-merchant.conf    | 2 +-
 7 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/bootstrap b/bootstrap
index 4b059cf..9f7be1c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -25,9 +25,11 @@ done
 cat >$base/activate <<EOL
 #!/bin/bash
 export TALER_DEPLOYMENT_BASE=$base
+export TALER_PREFIX=$base/local
 export PATH="$base/local/bin:$PATH"
 EOL
 
-ln -sft $base/.config $base/deployment/conf/taler.conf
-ln -sft $base/.config $base/deployment/conf/taler
+mkdir -p $base/config
+ln -sft $base/config $base/deployment/conf/taler.conf
+ln -sft $base/config $base/deployment/conf/taler
 
diff --git a/config/test.taler.net/taler.conf b/config/test.taler.net/taler.conf
index d49efb2..89dfbff 100644
--- a/config/test.taler.net/taler.conf
+++ b/config/test.taler.net/taler.conf
@@ -1,3 +1,8 @@
+[paths]
+TALER_CONFIG_HOME = ${TALER_DEPLOYMENT_BASE:-$HOME}/config
+# data that is shared across all deployments on e.g. one account
+TALER_DEPLOYMENT_SHARED = ${TALER_DEPLOYMENT_BASE:-$HOME}/shared
+
 [taler]
 CURRENCY = PUDOS
 
@@ -17,6 +22,7 @@ uwsgi_unixpath = ${TALER_DEPLOYMENT_BASE:-$HOME}/sockets/blog.uwsgi
 WIREFORMAT = test
 SERVE = unix
 UNIXPATH = ${TALER_DEPLOYMENT_BASE:-$HOME}/sockets/merchant.http
+KEYFILE = ${TALER_DEPLOYMENT_SHARED}/merchant/merchant.priv
 
 [merchant-wireformat]
 BANK_URI = https://bank.test.taler.net/
@@ -34,6 +40,9 @@ MASTER_KEY = CQQZ9DY3MZ1ARMN5K1VKDETS04Y2QCKMMCFHZSWJWWVN82BTTH00
 SERVE = unix
 UNIXPATH = ${TALER_DEPLOYMENT_BASE:-$HOME}/sockets/exchange.http
 
+KEYDIR = ${TALER_DEPLOYMENT_SHARED:-$HOME}/exchange/live-keys/
+MASTER_PRIV_FILE = ${TALER_DEPLOYMENT_SHARED}/exchange/offline-keys/master.priv
+
 MASTER_PUBLIC_KEY = CQQZ9DY3MZ1ARMN5K1VKDETS04Y2QCKMMCFHZSWJWWVN82BTTH00
 WIREFORMAT = test
 TESTRUN = YES
diff --git a/taler-arm/taler-blog.conf b/taler-arm/taler-blog.conf
index 3a42093..a2980ce 100644
--- a/taler-arm/taler-blog.conf
+++ b/taler-arm/taler-blog.conf
@@ -1,4 +1,4 @@
 [taler-blog]
 TYPE = simple
 BINARY = taler-merchant-blog
-OPTIONS = serve-uwsgi
+OPTIONS = serve-uwsgi -c ${TALER_DEPLOYMENT_BASE:-$HOME}/config/taler.conf
diff --git a/taler-arm/taler-demobank.conf b/taler-arm/taler-demobank.conf
index be61219..1bca0fc 100644
--- a/taler-arm/taler-demobank.conf
+++ b/taler-arm/taler-demobank.conf
@@ -1,4 +1,4 @@
 [taler-demobank]
 TYPE = simple
 BINARY = taler-bank-manage
-OPTIONS = serve-uwsgi
+OPTIONS = serve-uwsgi -c ${TALER_DEPLOYMENT_BASE:-$HOME}/config/taler.conf
diff --git a/taler-arm/taler-donations.conf b/taler-arm/taler-donations.conf
index e3588ec..4be7075 100644
--- a/taler-arm/taler-donations.conf
+++ b/taler-arm/taler-donations.conf
@@ -1,4 +1,4 @@
 [taler-donations]
 TYPE = simple
 BINARY = taler-merchant-donations
-OPTIONS = serve-uwsgi
+OPTIONS = serve-uwsgi -c ${TALER_DEPLOYMENT_BASE:-$HOME}/config/taler.conf
diff --git a/taler-arm/taler-exchange.conf b/taler-arm/taler-exchange.conf
index 3bbebde..24a528f 100644
--- a/taler-arm/taler-exchange.conf
+++ b/taler-arm/taler-exchange.conf
@@ -1,3 +1,4 @@
 [taler-exchange]
 TYPE = simple
 BINARY = taler-exchange-httpd
+OPTIONS = -c ${TALER_DEPLOYMENT_BASE:-$HOME}/config/taler.conf
diff --git a/taler-arm/taler-merchant.conf b/taler-arm/taler-merchant.conf
index 70318c6..3b1c876 100644
--- a/taler-arm/taler-merchant.conf
+++ b/taler-arm/taler-merchant.conf
@@ -1,4 +1,4 @@
 [taler-merchant]
 TYPE = simple
 BINARY = taler-merchant-httpd
-OPTIONS = -t
+OPTIONS = -t -c ${TALER_DEPLOYMENT_BASE:-$HOME}/config/taler.conf
-- 
cgit v1.2.3