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 }}