diff --git a/Dockerfile.alpine b/Dockerfile.alpine index 38b85df09..6db80ad01 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -29,6 +29,7 @@ ADD transmission/ /etc/transmission/ ENV OPENVPN_USERNAME=**None** \ OPENVPN_PASSWORD=**None** \ OPENVPN_PROVIDER=**None** \ + GLOBAL_APPLY_PERMISSIONS=true \ TRANSMISSION_ALT_SPEED_DOWN=50 \ TRANSMISSION_ALT_SPEED_ENABLED=false \ TRANSMISSION_ALT_SPEED_TIME_BEGIN=540 \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 9555adabb..a3b731e08 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -32,6 +32,7 @@ ADD tinyproxy /opt/tinyproxy/ ENV OPENVPN_USERNAME=**None** \ OPENVPN_PASSWORD=**None** \ OPENVPN_PROVIDER=**None** \ + GLOBAL_APPLY_PERMISSIONS=true \ TRANSMISSION_ALT_SPEED_DOWN=50 \ TRANSMISSION_ALT_SPEED_ENABLED=false \ TRANSMISSION_ALT_SPEED_TIME_BEGIN=540 \ diff --git a/transmission/userSetup.sh b/transmission/userSetup.sh index df8a8af83..4b79bc692 100644 --- a/transmission/userSetup.sh +++ b/transmission/userSetup.sh @@ -4,36 +4,34 @@ RUN_AS=root -TEMP_TRAN_DOWNLOAD_DIR=${TRANSMISSION_DOWNLOAD_DIR} -TEMP_TRAN_INCOMPLETE_DIR=${TRANSMISSION_INCOMPLETE_DIR} -TEMP_TRAN_WATCH_DIR=${TRANSMISSION_WATCH_DIR} - -if ! [ "$GLOBAL_APPLY_PERMISSIONS" = true ] ; then - unset TEMP_TRAN_DOWNLOAD_DIR - unset TEMP_TRAN_INCOMPLETE_DIR - unset TEMP_TRAN_WATCH_DIR -fi - if [ -n "$PUID" ] && [ ! "$(id -u root)" -eq "$PUID" ]; then RUN_AS=abc if [ ! "$(id -u ${RUN_AS})" -eq "$PUID" ]; then usermod -o -u "$PUID" ${RUN_AS} ; fi if [ ! "$(id -g ${RUN_AS})" -eq "$PGID" ]; then groupmod -o -g "$PGID" ${RUN_AS} ; fi - echo "Setting owner for transmission paths to ${PUID}:${PGID}" + echo "Enforcing ownership on transmission config directories" chown -R ${RUN_AS}:${RUN_AS} \ /config \ - ${TRANSMISSION_HOME} \ - ${TEMP_TRAN_DOWNLOAD_DIR} \ - ${TEMP_TRAN_INCOMPLETE_DIR} \ - ${TEMP_TRAN_WATCH_DIR} + ${TRANSMISSION_HOME} - echo "Setting permission for files (644) and directories (755)" + echo "Applying permissions to transmission config directories" chmod -R go=rX,u=rwX \ /config \ - ${TRANSMISSION_HOME} \ - ${TEMP_TRAN_DOWNLOAD_DIR} \ - ${TEMP_TRAN_INCOMPLETE_DIR} \ - ${TEMP_TRAN_WATCH_DIR} + ${TRANSMISSION_HOME} + + if [ "$GLOBAL_APPLY_PERMISSIONS" = true ] ; then + echo "Setting owner for transmission paths to ${PUID}:${PGID}" + chown -R ${RUN_AS}:${RUN_AS} \ + ${TRANSMISSION_DOWNLOAD_DIR} \ + ${TRANSMISSION_INCOMPLETE_DIR} \ + ${TRANSMISSION_WATCH_DIR} + + echo "Setting permission for files (644) and directories (755)" + chmod -R go=rX,u=rwX \ + ${TRANSMISSION_DOWNLOAD_DIR} \ + ${TRANSMISSION_INCOMPLETE_DIR} \ + ${TRANSMISSION_WATCH_DIR} + fi fi echo "