From f27acc87f234b6ae8e5081f15546a326ed596152 Mon Sep 17 00:00:00 2001 From: Andrew Erickson Date: Wed, 17 Jan 2018 23:43:02 -0800 Subject: [PATCH 1/7] disabling use of ppa --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2c6160ce2..6093076ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ VOLUME /config RUN apt-get update \ && apt-get -y upgrade \ && apt-get -y install software-properties-common wget git \ - && add-apt-repository ppa:transmissionbt/ppa \ +# && add-apt-repository ppa:transmissionbt/ppa \ && wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg | apt-key add - \ && echo "deb http://build.openvpn.net/debian/openvpn/stable xenial main" > /etc/apt/sources.list.d/openvpn-aptrepo.list \ && apt-get update \ From 38a4dcfbaca0579b28e855b04439d82c90de85a4 Mon Sep 17 00:00:00 2001 From: Andrew Erickson Date: Wed, 17 Jan 2018 23:43:19 -0800 Subject: [PATCH 2/7] using sed to fix True to true --- transmission/start.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/transmission/start.sh b/transmission/start.sh index 456a43faf..a7ace78d1 100755 --- a/transmission/start.sh +++ b/transmission/start.sh @@ -30,6 +30,9 @@ echo "Generating transmission settings.json from env variables" mkdir -p ${TRANSMISSION_HOME} dockerize -template /etc/transmission/settings.tmpl:${TRANSMISSION_HOME}/settings.json +echo "sed'ing True to true" +sed -i 's/True/true/g' ${TRANSMISSION_HOME}/settings.json + if [ ! -e "/dev/random" ]; then # Avoid "Fatal: no entropy gathering module detected" error echo "INFO: /dev/random not found - symlink to /dev/urandom" From 09544f8074a60835f55e27b5685410847eb82f16 Mon Sep 17 00:00:00 2001 From: Andrew Erickson Date: Thu, 18 Jan 2018 00:05:35 -0800 Subject: [PATCH 3/7] add new rpc host whitelist settings to template --- transmission/settings.tmpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/transmission/settings.tmpl b/transmission/settings.tmpl index f7ac574c4..30e393569 100644 --- a/transmission/settings.tmpl +++ b/transmission/settings.tmpl @@ -46,6 +46,8 @@ "rpc-authentication-required": {{ .Env.TRANSMISSION_RPC_AUTHENTICATION_REQUIRED }}, "rpc-bind-address": "{{ .Env.TRANSMISSION_RPC_BIND_ADDRESS }}", "rpc-enabled": {{ .Env.TRANSMISSION_RPC_ENABLED }}, + "rpc-host-whitelist" : {{ .Env.RPC_HOST_WHITELIST }}, + "rpc-host-whitelist-enabled" : {{ .Env.RPC_HOST_WHITELIST_ENABLED }}, "rpc-password": "{{ .Env.TRANSMISSION_RPC_PASSWORD }}", "rpc-port": {{ .Env.TRANSMISSION_RPC_PORT }}, "rpc-url": "{{ .Env.TRANSMISSION_RPC_URL }}", From c56b7c66cb7e8b5c4a9ea20e1f642f836acbe859 Mon Sep 17 00:00:00 2001 From: Andrew Erickson Date: Thu, 18 Jan 2018 00:08:58 -0800 Subject: [PATCH 4/7] typo fix --- transmission/settings.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/transmission/settings.tmpl b/transmission/settings.tmpl index 30e393569..344c28e1c 100644 --- a/transmission/settings.tmpl +++ b/transmission/settings.tmpl @@ -46,8 +46,8 @@ "rpc-authentication-required": {{ .Env.TRANSMISSION_RPC_AUTHENTICATION_REQUIRED }}, "rpc-bind-address": "{{ .Env.TRANSMISSION_RPC_BIND_ADDRESS }}", "rpc-enabled": {{ .Env.TRANSMISSION_RPC_ENABLED }}, - "rpc-host-whitelist" : {{ .Env.RPC_HOST_WHITELIST }}, - "rpc-host-whitelist-enabled" : {{ .Env.RPC_HOST_WHITELIST_ENABLED }}, + "rpc-host-whitelist" : {{ .Env.TRANSMISSION_RPC_HOST_WHITELIST }}, + "rpc-host-whitelist-enabled" : {{ .Env.TRANSMISSION_RPC_HOST_WHITELIST_ENABLED }}, "rpc-password": "{{ .Env.TRANSMISSION_RPC_PASSWORD }}", "rpc-port": {{ .Env.TRANSMISSION_RPC_PORT }}, "rpc-url": "{{ .Env.TRANSMISSION_RPC_URL }}", From b8743f8ae328c865cdebf91c8386d187fd537c40 Mon Sep 17 00:00:00 2001 From: Andrew Erickson Date: Thu, 18 Jan 2018 00:19:14 -0800 Subject: [PATCH 5/7] fix spacing --- transmission/settings.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/transmission/settings.tmpl b/transmission/settings.tmpl index 344c28e1c..d018ef2df 100644 --- a/transmission/settings.tmpl +++ b/transmission/settings.tmpl @@ -46,8 +46,8 @@ "rpc-authentication-required": {{ .Env.TRANSMISSION_RPC_AUTHENTICATION_REQUIRED }}, "rpc-bind-address": "{{ .Env.TRANSMISSION_RPC_BIND_ADDRESS }}", "rpc-enabled": {{ .Env.TRANSMISSION_RPC_ENABLED }}, - "rpc-host-whitelist" : {{ .Env.TRANSMISSION_RPC_HOST_WHITELIST }}, - "rpc-host-whitelist-enabled" : {{ .Env.TRANSMISSION_RPC_HOST_WHITELIST_ENABLED }}, + "rpc-host-whitelist": "{{ .Env.TRANSMISSION_RPC_HOST_WHITELIST }}", + "rpc-host-whitelist-enabled": {{ .Env.TRANSMISSION_RPC_HOST_WHITELIST_ENABLED }}, "rpc-password": "{{ .Env.TRANSMISSION_RPC_PASSWORD }}", "rpc-port": {{ .Env.TRANSMISSION_RPC_PORT }}, "rpc-url": "{{ .Env.TRANSMISSION_RPC_URL }}", From 7608155f83b30d75911b8a9dd6635a175c70528b Mon Sep 17 00:00:00 2001 From: Andrew Erickson Date: Thu, 18 Jan 2018 00:19:30 -0800 Subject: [PATCH 6/7] add default values for env vars --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 6093076ae..9ba598386 100644 --- a/Dockerfile +++ b/Dockerfile @@ -79,6 +79,8 @@ ENV OPENVPN_USERNAME=**None** \ TRANSMISSION_RPC_AUTHENTICATION_REQUIRED=false \ TRANSMISSION_RPC_BIND_ADDRESS=0.0.0.0 \ TRANSMISSION_RPC_ENABLED=true \ + TRANSMISSION_RPC_HOST_WHITELIST= \ + TRANSMISSION_RPC_HOST_WHITELIST_ENABLED=true \ TRANSMISSION_RPC_PASSWORD=password \ TRANSMISSION_RPC_PORT=9091 \ TRANSMISSION_RPC_URL=/transmission/ \ From 52885e054f4d96e237b8bec6c41aa10d8f48d933 Mon Sep 17 00:00:00 2001 From: Andrew Erickson Date: Thu, 18 Jan 2018 00:35:11 -0800 Subject: [PATCH 7/7] add env vars in missing spots --- DockerEnv | 2 ++ transmission/environment-variables.tmpl | 2 ++ 2 files changed, 4 insertions(+) diff --git a/DockerEnv b/DockerEnv index 9f5c2336c..e216a376c 100644 --- a/DockerEnv +++ b/DockerEnv @@ -52,6 +52,8 @@ #TRANSMISSION_RPC_AUTHENTICATION_REQUIRED=false #TRANSMISSION_RPC_BIND_ADDRESS=0.0.0.0 #TRANSMISSION_RPC_ENABLED=true +#TRANSMISSION_RPC_HOST_WHITELIST= +#TRANSMISSION_RPC_HOST_WHITELIST_ENABLED=true #TRANSMISSION_RPC_PASSWORD=password #TRANSMISSION_RPC_PORT=9091 #TRANSMISSION_RPC_URL=/transmission/ diff --git a/transmission/environment-variables.tmpl b/transmission/environment-variables.tmpl index 5ae9d6538..02737b45a 100644 --- a/transmission/environment-variables.tmpl +++ b/transmission/environment-variables.tmpl @@ -47,6 +47,8 @@ export TRANSMISSION_RENAME_PARTIAL_FILES={{ .Env.TRANSMISSION_RENAME_PARTIAL_FIL export TRANSMISSION_RPC_AUTHENTICATION_REQUIRED={{ .Env.TRANSMISSION_RPC_AUTHENTICATION_REQUIRED }} export TRANSMISSION_RPC_BIND_ADDRESS={{ .Env.TRANSMISSION_RPC_BIND_ADDRESS }} export TRANSMISSION_RPC_ENABLED={{ .Env.TRANSMISSION_RPC_ENABLED }} +export TRANSMISSION_RPC_HOST_WHITELIST={{ .Env.TRANSMISSION_RPC_HOST_WHITELIST }} +export TRANSMISSION_RPC_HOST_WHITELIST_ENABLED={{ .Env.TRANSMISSION_RPC_HOST_WHITELIST_ENABLED }} export TRANSMISSION_RPC_PASSWORD={{ .Env.TRANSMISSION_RPC_PASSWORD }} export TRANSMISSION_RPC_PORT={{ .Env.TRANSMISSION_RPC_PORT }} export TRANSMISSION_RPC_URL={{ .Env.TRANSMISSION_RPC_URL }}