From 427f11049a5294390cc5cf7cc4632680502d1f63 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 10 Jun 2017 20:27:23 +0100
Subject: [PATCH] tahoelafs paths
---
src/freedombone-app-tahoelafs | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/freedombone-app-tahoelafs b/src/freedombone-app-tahoelafs
index 365864102..88e4959fc 100755
--- a/src/freedombone-app-tahoelafs
+++ b/src/freedombone-app-tahoelafs
@@ -545,9 +545,9 @@ function create_tahoelafs_daemon {
echo 'Type=simple' >> $TAHOELAFS_DAEMON_FILE
echo "User=tahoelafs" >> $TAHOELAFS_DAEMON_FILE
echo "Group=debian-tor" >> $TAHOELAFS_DAEMON_FILE
- echo "WorkingDirectory=${TAHOE_DIR}/tahoelafs" >> $TAHOELAFS_DAEMON_FILE
- echo "ExecStart=${TAHOE_DIR}/tahoelafs/venv/bin/tahoe run ${TAHOE_DIR}/${daemon_name}" >> $TAHOELAFS_DAEMON_FILE
- echo "ExecStop=${TAHOE_DIR}/tahoelafs/venv/bin/tahoe stop ${TAHOE_DIR}/${daemon_name}" >> $TAHOELAFS_DAEMON_FILE
+ echo "WorkingDirectory=${TAHOE_DIR}" >> $TAHOELAFS_DAEMON_FILE
+ echo "ExecStart=/usr/bin/tahoe run ${TAHOE_DIR}/${daemon_name}" >> $TAHOELAFS_DAEMON_FILE
+ echo "ExecStop=/usr/bin/tahoe stop ${TAHOE_DIR}/${daemon_name}" >> $TAHOELAFS_DAEMON_FILE
echo 'Restart=on-failure' >> $TAHOELAFS_DAEMON_FILE
echo 'RestartSec=10' >> $TAHOELAFS_DAEMON_FILE
echo "Environment=\"USER=tahoelafs\" \"HOME=${TAHOE_DIR}\"" >> $TAHOELAFS_DAEMON_FILE
@@ -628,8 +628,8 @@ function install_tahoelafs {
# create a user
adduser --disabled-login --gecos 'tahoe-lafs' tahoelafs
- if [ ! -d /home/tahoelafs ]; then
- echo $'/home/tahoelafs directory was not created'
+ if [ ! -d $TAHOE_DIR ]; then
+ echo $"$TAHOE_DIR directory was not created"
exit 879335
fi
--
GitLab