Merge branch 'master' of https://github.com/jandrews377/docker-transmission-openvpn into feature/proxy

2018-02-22 18:33:41 +01:00
parent baa8cdef41 ad0e33a463
commit b3b97e4237
11 changed files with 88 additions and 4 deletions
--- a/transmission/environment-variables.tmpl
+++ b/transmission/environment-variables.tmpl
@@ -81,6 +81,10 @@ export TRANSMISSION_WEB_UI={{ .Env.TRANSMISSION_WEB_UI }}
 export PUID={{ .Env.PUID }}
 export PGID={{ .Env.PGID }}

+# Need to pass through our tinyproxy settings
+export WEBPROXY_ENABLED={{ .Env.WEBPROXY_ENABLED }}
+export WEBPROXY_PORT={{ .Env.WEBPROXY_PORT }}
+
 # Support custom web frontend
 {{ if .Env.TRANSMISSION_WEB_HOME }} export TRANSMISSION_WEB_HOME={{ .Env.TRANSMISSION_WEB_HOME }} {{end}}