From e310c922cae41bd7a209ad57466edc4c07df6505 Mon Sep 17 00:00:00 2001 From: Stefaan Ghysels Date: Sat, 28 Nov 2020 15:02:57 +0100 Subject: [PATCH] Improve config --- wdpk/rclone/preinst.sh | 2 +- wdpk/rclone/start.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/wdpk/rclone/preinst.sh b/wdpk/rclone/preinst.sh index 5d61c92..fd565b0 100755 --- a/wdpk/rclone/preinst.sh +++ b/wdpk/rclone/preinst.sh @@ -12,5 +12,5 @@ APKG_BACKUP_PATH=${APKG_PATH}/../${APKG_MODULE}_backup if [ ! -d ${APKG_BACKUP_PATH}] ; then # move config to backup path mkdir -p ${APKG_BACKUP_PATH} - mv -f $APKG_PATH/config ${APKG_BACKUP_PATH} + mv -f ${APKG_PATH}/rclone.config ${APKG_BACKUP_PATH} fi diff --git a/wdpk/rclone/start.sh b/wdpk/rclone/start.sh index 44cab65..d216db6 100755 --- a/wdpk/rclone/start.sh +++ b/wdpk/rclone/start.sh @@ -3,6 +3,8 @@ cd $(dirname $0) source ./env +CONFIG=$(pwd)/rclone.config + [ ! -f /usr/bin/rclone ] echo "rclone not found" >> /tmp/debug_apkg [ -f /tmp/debug_apkg ] echo "APKG_DEBUG: starting Rclone" >> /tmp/debug_apkg @@ -12,4 +14,4 @@ source ./env ADDRESS=$(sed -n '/ip/ {s/.*\(\S*\)<\/ip>/\1/p;q}' /etc/NAS_CFG/config.xml ) # TODO: get user and pw from file -rclone rcd --rc-web-gui --rc-addr ${ADDRESS}:${PORT:-5582} --rc-user ${RCLONE_USER:-mycloud} --rc-pass ${RCLONE_PW:-mycloud} +rclone rcd --config ${CONFIG} --rc-web-gui --rc-addr ${ADDRESS}:${PORT:-5582} --rc-user ${RCLONE_USER:-mycloud} --rc-pass ${RCLONE_PW:-mycloud}