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

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