Merge branch 'master' of https://github.com/aseber/docker-transmission-openvpn into aseber-master
This commit is contained in:
@@ -81,5 +81,6 @@
|
||||
#TRANSMISSION_WATCH_DIR=/data/watch
|
||||
#TRANSMISSION_WATCH_DIR_ENABLED=true
|
||||
#TRANSMISSION_HOME=/data/transmission-home
|
||||
#TRANSMISSION_WATCH_DIR_FORCE_GENERIC=false
|
||||
#WEBPROXY_ENABLED=false
|
||||
#WEBPROXY_PORT=8888
|
||||
|
@@ -114,6 +114,7 @@ ENV OPENVPN_USERNAME=**None** \
|
||||
TRANSMISSION_WATCH_DIR=/data/watch \
|
||||
TRANSMISSION_WATCH_DIR_ENABLED=true \
|
||||
TRANSMISSION_HOME=/data/transmission-home \
|
||||
TRANSMISSION_WATCH_DIR_FORCE_GENERIC=false \
|
||||
ENABLE_UFW=false \
|
||||
UFW_ALLOW_GW_NET=false \
|
||||
UFW_EXTRA_PORTS= \
|
||||
|
@@ -104,6 +104,7 @@ ENV OPENVPN_USERNAME=**None** \
|
||||
TRANSMISSION_WATCH_DIR=/data/watch \
|
||||
TRANSMISSION_WATCH_DIR_ENABLED=true \
|
||||
TRANSMISSION_HOME=/data/transmission-home \
|
||||
TRANSMISSION_WATCH_DIR_FORCE_GENERIC=false \
|
||||
ENABLE_UFW=false \
|
||||
UFW_ALLOW_GW_NET=false \
|
||||
UFW_EXTRA_PORTS= \
|
||||
|
@@ -107,6 +107,7 @@ ENV OPENVPN_USERNAME=**None** \
|
||||
TRANSMISSION_WATCH_DIR=/data/watch \
|
||||
TRANSMISSION_WATCH_DIR_ENABLED=true \
|
||||
TRANSMISSION_HOME=/data/transmission-home \
|
||||
TRANSMISSION_WATCH_DIR_FORCE_GENERIC=false \
|
||||
ENABLE_UFW=false \
|
||||
UFW_ALLOW_GW_NET=false \
|
||||
UFW_EXTRA_PORTS= \
|
||||
|
@@ -71,6 +71,7 @@ export TRANSMISSION_UPLOAD_SLOTS_PER_TORRENT={{ .Env.TRANSMISSION_UPLOAD_SLOTS_P
|
||||
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 }}
|
||||
export TRANSMISSION_WATCH_DIR_FORCE_GENERIC={{ .Env.TRANSMISSION_WATCH_DIR_FORCE_GENERIC }}
|
||||
|
||||
# Transmission needs to know which VPN provider is used
|
||||
export OPENVPN_PROVIDER={{ .Env.OPENVPN_PROVIDER }}
|
||||
|
@@ -69,6 +69,7 @@
|
||||
"upload-slots-per-torrent": {{ .Env.TRANSMISSION_UPLOAD_SLOTS_PER_TORRENT }},
|
||||
"utp-enabled": {{ .Env.TRANSMISSION_UTP_ENABLED }},
|
||||
"watch-dir": "{{ .Env.TRANSMISSION_WATCH_DIR }}",
|
||||
"watch-dir-enabled": {{ .Env.TRANSMISSION_WATCH_DIR_ENABLED }}
|
||||
"watch-dir-enabled": {{ .Env.TRANSMISSION_WATCH_DIR_ENABLED }},
|
||||
"watch-dir-force-generic": {{ .Env.TRANSMISSION_WATCH_DIR_FORCE_GENERIC }}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user