Skip to content

Don't clobber user directory settings on start #2970

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Don't clobber user directory settings on start #2970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,6 @@ ENV OPENVPN_USERNAME=**None** \
TRANSMISSION_RPC_PORT=9091 \
TRANSMISSION_RPC_USERNAME= \
TRANSMISSION_RPC_PASSWORD= \
TRANSMISSION_DOWNLOAD_DIR=/data/completed \
TRANSMISSION_INCOMPLETE_DIR=/data/incomplete \
TRANSMISSION_WATCH_DIR=/data/watch \
CREATE_TUN_DEVICE=true \
ENABLE_UFW=false \
UFW_ALLOW_GW_NET=false \
Expand Down
4 changes: 2 additions & 2 deletions transmission/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@ case ${TRANSMISSION_LOG_LEVEL,,} in
;;
esac

. /etc/transmission/userSetup.sh

echo "Updating Transmission settings.json with values from env variables"
# Ensure TRANSMISSION_HOME is created
mkdir -p ${TRANSMISSION_HOME}
python3 /etc/transmission/updateSettings.py /etc/transmission/default-settings.json ${TRANSMISSION_HOME}/settings.json || exit 1

. /etc/transmission/userSetup.sh

echo "sed'ing True to true"
sed -i 's/True/true/g' ${TRANSMISSION_HOME}/settings.json

Expand Down
13 changes: 7 additions & 6 deletions transmission/userSetup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@ if [ -n "$PUID" ] && [ ! "$(id -u root)" -eq "$PUID" ]; then
chown ${RUN_AS}:${RUN_AS} /dev/stdout
fi

# fetch from settings.json if not defined in environment
for var_name in TRANSMISSION_DOWNLOAD_DIR TRANSMISSION_INCOMPLETE_DIR TRANSMISSION_WATCH_DIR TRANSMISSION_UMASK; do
if [[ ! -v $var_name ]]; then
setting_name=$(echo "${var_name#TRANSMISSION_}" | tr '[:upper:]_' '[:lower:]-')
declare "${var_name}=$(jq -r .\"${setting_name}\" ${TRANSMISSION_HOME}/settings.json)"
fi
done

# Make sure directories exist before chown and chmod
mkdir -p /config \
Expand Down Expand Up @@ -45,12 +52,6 @@ if [ -n "$PUID" ] && [ ! "$(id -u root)" -eq "$PUID" ]; then

echo "Setting permissions for download and incomplete directories"

if [ -z "$TRANSMISSION_UMASK" ] ; then
# fetch from settings.json if not defined in environment
# because updateSettings.py is called after this script is run
TRANSMISSION_UMASK=$(jq .umask ${TRANSMISSION_HOME}/settings.json | tr -d \" )
fi

TRANSMISSION_UMASK_OCTAL=$( printf "%o\n" "${TRANSMISSION_UMASK}" )

DIR_PERMS=$( printf '%o\n' $(( 8#777 & ~TRANSMISSION_UMASK)) )
Expand Down