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

---
 taler-arm/taler-merchant.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'taler-arm/taler-merchant.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