6 files changed, 6 insertions, 7 deletions
diff --git a/taler-arm/defaults.conf b/taler-arm/defaults.conf
index ec2c267..c4f28c3 100644
--- a/taler-arm/defaults.conf
+++ b/taler-arm/defaults.conf
@@ -10,7 +10,7 @@ GNUNET_CONFIG_HOME = ${XDG_CONFIG_HOME:-$GNUNET_HOME/.config}/gnunet/
 # Cached data, no big deal if lost
 GNUNET_CACHE_HOME = ${XDG_CACHE_HOME:-$GNUNET_HOME/.cache}/gnunet/
 
-GNUNET_RUNTIME_DIR = ${TALER_DEPLOYMENT_BASE}/run/gnunet-system-runtime
+GNUNET_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/gnunet-system-runtime/
 
 # Runtime data for per-user services
-GNUNET_USER_RUNTIME_DIR = ${TALER_DEPLOYMENT_BASE}/run/gnunet-${USERHOME:-${USER:-user}}-runtime/
+GNUNET_USER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/gnunet-${USERHOME:-${USER:-user}}-runtime/
diff --git a/taler-arm/taler-blog.conf b/taler-arm/taler-blog.conf
index b3e6992..3a42093 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 = -c ${TALER_DEPLOYMENT_BASE:-$HOME}/config/taler.conf serve-uwsgi
+OPTIONS = serve-uwsgi
diff --git a/taler-arm/taler-demobank.conf b/taler-arm/taler-demobank.conf
index 62e8921..be61219 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 = -c ${TALER_DEPLOYMENT_BASE:-$HOME}/config/taler.conf serve-uwsgi
+OPTIONS = serve-uwsgi
diff --git a/taler-arm/taler-donations.conf b/taler-arm/taler-donations.conf
index d9727c8..e3588ec 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 = -c ${TALER_DEPLOYMENT_BASE:-$HOME}/config/taler.conf serve-uwsgi
+OPTIONS = serve-uwsgi
diff --git a/taler-arm/taler-exchange.conf b/taler-arm/taler-exchange.conf
index 24a528f..3bbebde 100644
--- a/taler-arm/taler-exchange.conf
+++ b/taler-arm/taler-exchange.conf
@@ -1,4 +1,3 @@
 [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 3b1c876..70318c6 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 -c ${TALER_DEPLOYMENT_BASE:-$HOME}/config/taler.conf
+OPTIONS = -t