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

Merge remote-tracking branch 'origin/dev' into transmission-resume-torrent

Browse Source 
Conflicts:
	transmission/start.sh
	transmission/updatePort.sh
This commit is contained in:
Doug Daniels
2015-08-13 11:26:21 -05:00
parent 8d43c09bfb e820db27c7
commit 0faafc3a99
39 changed files with 252 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
transmission/environment-variables.tmpl
View File

@@ -72,3 +72,5 @@ export TRANSMISSION_UTP_ENABLED={{ .Env.TRANSMISSION_UTP_ENABLED }}
export TRANSMISSION_WATCH_DIR={{ .Env.TRANSMISSION_WATCH_DIR }}
export TRANSMISSION_WATCH_DIR_ENABLED={{ .Env.TRANSMISSION_WATCH_DIR_ENABLED }}
# Transmission needs to know which VPN provider is used
export OPENVPN_PROVIDER={{ .Env.OPENVPN_PROVIDER }}

2
transmission/periodicUpdates.sh
View File

@@ -3,6 +3,6 @@
while [ 1 ]
do
sleep 1m
/etc/transmission-daemon/updatePort.sh
/etc/transmission/updatePort.sh
sleep 1h
done

13
transmission/start.sh
View File

@@ -1,7 +1,7 @@
#!/bin/sh
# Source our persisted env variables from container startup
. /etc/transmission-daemon/environment-variables.sh
. /etc/transmission/environment-variables.sh
tun0ip=$(ifconfig tun0 | sed -n '2 p' | awk '{print $2}' | cut -d: -f2)
echo "Updating TRANSMISSION_BIND_ADDRESS_IPV4 to tun0 ip: ${tun0ip}"
@@ -10,12 +10,17 @@ export TRANSMISSION_BIND_ADDRESS_IPV4=${tun0ip}
echo "Generating transmission settings.json from env variables"
# Ensure TRANSMISSION_HOME is created
mkdir -p ${TRANSMISSION_HOME}
dockerize -template /etc/transmission-daemon/settings.tmpl:${TRANSMISSION_HOME}/settings.json /bin/true
dockerize -template /etc/transmission/settings.tmpl:${TRANSMISSION_HOME}/settings.json /bin/true
echo "STARTING TRANSMISSION"
exec /usr/bin/transmission-daemon -g ${TRANSMISSION_HOME} &
echo "STARTING PORT UPDATER"
exec /etc/transmission-daemon/periodicUpdates.sh &
if [ "$OPENVPN_PROVIDER" = "PIA" ]
then
echo "STARTING PORT UPDATER"
exec /etc/transmission/periodicUpdates.sh &
else
echo "NO PORT UPDATER FOR THIS PROVIDER"
fi
echo "Transmission startup script complete."

6
transmission/updatePort.sh
View File

@@ -1,10 +1,10 @@
#! /bin/sh
# Source our persisted env variables from container startup
. /etc/transmission-daemon/environment-variables.sh
. /etc/transmission/environment-variables.sh
# Settings
PIA_PASSWD_FILE=/config/pia-credentials.txt
PIA_PASSWD_FILE=/config/openvpn-credentials.txt
TRANSMISSION_PASSWD_FILE=/config/transmission-credentials.txt
pia_username=$(head -1 $PIA_PASSWD_FILE)
@@ -12,7 +12,7 @@ pia_passwd=$(tail -1 $PIA_PASSWD_FILE)
transmission_username=$(head -1 $TRANSMISSION_PASSWD_FILE)
transmission_passwd=$(tail -1 $TRANSMISSION_PASSWD_FILE)
local_vpn_ip=$(ip addr show tun0 | grep inet | awk '{ print $2 }')
pia_client_id_file=/etc/transmission-daemon/pia_client_id
pia_client_id_file=/etc/transmission/pia_client_id
transmission_settings_file=${TRANSMISSION_HOME}/settings.json
port_assignment_url=https://www.privateinternetaccess.com/vpninfo/port_forward_assignment