|
@@ -545,9 +545,9 @@ function create_tahoelafs_daemon {
|
545
|
545
|
echo 'Type=simple' >> $TAHOELAFS_DAEMON_FILE
|
546
|
546
|
echo "User=tahoelafs" >> $TAHOELAFS_DAEMON_FILE
|
547
|
547
|
echo "Group=debian-tor" >> $TAHOELAFS_DAEMON_FILE
|
548
|
|
- echo "WorkingDirectory=${TAHOE_DIR}/tahoelafs" >> $TAHOELAFS_DAEMON_FILE
|
549
|
|
- echo "ExecStart=${TAHOE_DIR}/tahoelafs/venv/bin/tahoe run ${TAHOE_DIR}/${daemon_name}" >> $TAHOELAFS_DAEMON_FILE
|
550
|
|
- echo "ExecStop=${TAHOE_DIR}/tahoelafs/venv/bin/tahoe stop ${TAHOE_DIR}/${daemon_name}" >> $TAHOELAFS_DAEMON_FILE
|
|
548
|
+ echo "WorkingDirectory=${TAHOE_DIR}" >> $TAHOELAFS_DAEMON_FILE
|
|
549
|
+ echo "ExecStart=/usr/bin/tahoe run ${TAHOE_DIR}/${daemon_name}" >> $TAHOELAFS_DAEMON_FILE
|
|
550
|
+ echo "ExecStop=/usr/bin/tahoe stop ${TAHOE_DIR}/${daemon_name}" >> $TAHOELAFS_DAEMON_FILE
|
551
|
551
|
echo 'Restart=on-failure' >> $TAHOELAFS_DAEMON_FILE
|
552
|
552
|
echo 'RestartSec=10' >> $TAHOELAFS_DAEMON_FILE
|
553
|
553
|
echo "Environment=\"USER=tahoelafs\" \"HOME=${TAHOE_DIR}\"" >> $TAHOELAFS_DAEMON_FILE
|
|
@@ -628,8 +628,8 @@ function install_tahoelafs {
|
628
|
628
|
# create a user
|
629
|
629
|
adduser --disabled-login --gecos 'tahoe-lafs' tahoelafs
|
630
|
630
|
|
631
|
|
- if [ ! -d /home/tahoelafs ]; then
|
632
|
|
- echo $'/home/tahoelafs directory was not created'
|
|
631
|
+ if [ ! -d $TAHOE_DIR ]; then
|
|
632
|
+ echo $"$TAHOE_DIR directory was not created"
|
633
|
633
|
exit 879335
|
634
|
634
|
fi
|
635
|
635
|
|