diff --git a/Dockerfile b/Dockerfile index 7962f41ee..993735729 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,7 +30,6 @@ RUN apt-get update \ ADD openvpn/ /etc/openvpn/ ADD transmission/ /etc/transmission/ -ADD transmission/transmission-rss.conf /etc/transmission-rss.conf ENV OPENVPN_USERNAME=**None** \ OPENVPN_PASSWORD=**None** \ diff --git a/transmission/start.sh b/transmission/start.sh index a32be491a..573a06f0b 100755 --- a/transmission/start.sh +++ b/transmission/start.sh @@ -18,6 +18,10 @@ if [ "kettu" = "$TRANSMISSION_WEB_UI" ]; then export TRANSMISSION_WEB_HOME=/opt/transmission-ui/kettu fi +if [ ! -z "${RSS_URL}" ] && [ "${RSS_URL}" != "**None**" ] ; then + dockerize -template /etc/transmission/transmission-rss.tmpl:/etc/transmission-rss.conf +fi + echo "Generating transmission settings.json from env variables" # Ensure TRANSMISSION_HOME is created mkdir -p ${TRANSMISSION_HOME} @@ -46,7 +50,6 @@ if [ -z "${RSS_URL}" ] || [ "${RSS_URL}" = "**None**" ] ; then echo "NO RSS URL CONFIGURED, IGNORING" else echo "STARTING RSS PLUGIN" - sed -i "s#RSS_URL#$RSS_URL#" /etc/transmission-rss.conf transmission-rss fi diff --git a/transmission/transmission-rss.conf b/transmission/transmission-rss.conf deleted file mode 100644 index 5cb5265a4..000000000 --- a/transmission/transmission-rss.conf +++ /dev/null @@ -1,7 +0,0 @@ -feeds: - - url: RSS_URL - download_path: /var/lib/transmission-daemon/downloads -server: - host: 127.0.0.1 - port: 9091 - rpc_path: /transmission/rpc \ No newline at end of file diff --git a/transmission/transmission-rss.tmpl b/transmission/transmission-rss.tmpl new file mode 100644 index 000000000..499e88e94 --- /dev/null +++ b/transmission/transmission-rss.tmpl @@ -0,0 +1,7 @@ +feeds: + - url: {{ .Env.RSS_URL }} + download_path: {{ .Env.TRANSMISSION_DOWNLOAD_DIR }} +server: + host: 127.0.0.1 + port: 9091 + rpc_path: /transmission/rpc \ No newline at end of file