bea/docker-deluge-openvpn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Kristian Haugene
2020-04-07 11:17:37 +02:00
parent 17de0f404b 0b6ab30294
commit d9cab41704
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
transmission/start.sh
View File

@@ -61,7 +61,7 @@ if [[ "true" = "$DROP_DEFAULT_ROUTE" ]]; then
fi fi
if [[ "true" = "$DOCKER_LOG" ]]; then if [[ "true" = "$DOCKER_LOG" ]]; then
LOGFILE=/proc/1/fd/1 LOGFILE=/dev/stdout
else else
LOGFILE=${TRANSMISSION_HOME}/transmission.log LOGFILE=${TRANSMISSION_HOME}/transmission.log
fi fi

18
transmission/userSetup.sh
View File

@@ -6,8 +6,16 @@ RUN_AS=root
if [ -n "$PUID" ] && [ ! "$(id -u root)" -eq "$PUID" ]; then if [ -n "$PUID" ] && [ ! "$(id -u root)" -eq "$PUID" ]; then
RUN_AS=abc RUN_AS=abc
if [ ! "$(id -u ${RUN_AS})" -eq "$PUID" ]; then usermod -o -u "$PUID" ${RUN_AS} ; fi if [ ! "$(id -u ${RUN_AS})" -eq "$PUID" ]; then
if [ ! "$(id -g ${RUN_AS})" -eq "$PGID" ]; then groupmod -o -g "$PGID" ${RUN_AS} ; fi usermod -o -u "$PUID" ${RUN_AS};
fi
if [ ! "$(id -g ${RUN_AS})" -eq "$PGID" ]; then
groupmod -o -g "$PGID" ${RUN_AS};
fi
if [[ "true" = "$DOCKER_LOG" ]]; then
chown ${RUN_AS}:${RUN_AS} /dev/stdout
fi
# Make sure directories exist before chown and chmod # Make sure directories exist before chown and chmod
mkdir -p /config \ mkdir -p /config \
@@ -27,18 +35,18 @@ if [ -n "$PUID" ] && [ ! "$(id -u root)" -eq "$PUID" ]; then
${TRANSMISSION_HOME} ${TRANSMISSION_HOME}
if [ "$GLOBAL_APPLY_PERMISSIONS" = true ] ; then if [ "$GLOBAL_APPLY_PERMISSIONS" = true ] ; then
echo "Setting owner for transmission paths to ${PUID}:${PGID}" echo "Setting owner for transmission paths to ${PUID}:${PGID}"
chown -R ${RUN_AS}:${RUN_AS} \ chown -R ${RUN_AS}:${RUN_AS} \
${TRANSMISSION_DOWNLOAD_DIR} \ ${TRANSMISSION_DOWNLOAD_DIR} \
${TRANSMISSION_INCOMPLETE_DIR} \ ${TRANSMISSION_INCOMPLETE_DIR} \
${TRANSMISSION_WATCH_DIR} ${TRANSMISSION_WATCH_DIR}
echo "Setting permission for files (644) and directories (755)" echo "Setting permission for files (644) and directories (755)"
chmod -R go=rX,u=rwX \ chmod -R go=rX,u=rwX \
${TRANSMISSION_DOWNLOAD_DIR} \ ${TRANSMISSION_DOWNLOAD_DIR} \
${TRANSMISSION_INCOMPLETE_DIR} \ ${TRANSMISSION_INCOMPLETE_DIR} \
echo "Setting permission for watch directory (775) and its files (664)" echo "Setting permission for watch directory (775) and its files (664)"
chmod -R o=rX,ug=rwX \ chmod -R o=rX,ug=rwX \
${TRANSMISSION_WATCH_DIR} ${TRANSMISSION_WATCH_DIR}
fi fi