Merge branch 'master' into dev

This commit is contained in:
Kristian Haugene 2015-10-31 18:42:43 +01:00
commit 78ea1d2fd4

View File

@ -12,9 +12,13 @@ echo "Generating transmission settings.json from env variables"
mkdir -p ${TRANSMISSION_HOME} mkdir -p ${TRANSMISSION_HOME}
dockerize -template /etc/transmission/settings.tmpl:${TRANSMISSION_HOME}/settings.json /bin/true dockerize -template /etc/transmission/settings.tmpl:${TRANSMISSION_HOME}/settings.json /bin/true
echo "STARTING TRANSMISSION" if [ ! -e "/dev/random" ]; then
# Avoid "Fatal: no entropy gathering module detected" error # Avoid "Fatal: no entropy gathering module detected" error
echo "INFO: /dev/random not found - symlink to /dev/urandom"
ln -s /dev/urandom /dev/random ln -s /dev/urandom /dev/random
fi
echo "STARTING TRANSMISSION"
exec /usr/bin/transmission-daemon -g ${TRANSMISSION_HOME} --logfile ${TRANSMISSION_HOME}/transmission.log & exec /usr/bin/transmission-daemon -g ${TRANSMISSION_HOME} --logfile ${TRANSMISSION_HOME}/transmission.log &
if [ "$OPENVPN_PROVIDER" = "PIA" ] if [ "$OPENVPN_PROVIDER" = "PIA" ]