diff --git a/plugins/rss/Dockerfile b/plugins/rss/Dockerfile index 5e312dab3..56b7d85dc 100644 --- a/plugins/rss/Dockerfile +++ b/plugins/rss/Dockerfile @@ -11,6 +11,7 @@ RUN apt-get update \ ADD . /etc/transmission-rss ENV TRANSMISSION_DOWNLOAD_DIR=/data/completed \ - RSS_URL=**None** + RSS_URL=**None** \ + RSS_REGEXP= CMD ["/etc/transmission-rss/start.sh"] diff --git a/plugins/rss/Dockerfile.armhf b/plugins/rss/Dockerfile.armhf index cb6d84a69..41c07892b 100644 --- a/plugins/rss/Dockerfile.armhf +++ b/plugins/rss/Dockerfile.armhf @@ -11,6 +11,7 @@ RUN apt-get update \ ADD . /etc/transmission-rss ENV TRANSMISSION_DOWNLOAD_DIR=/data/completed \ - RSS_URL=**None** + RSS_URL=**None** \ + RSS_REGEXP= CMD ["/etc/transmission-rss/start.sh"] diff --git a/plugins/rss/DockerfileCrossBuild.armhf b/plugins/rss/DockerfileCrossBuild.armhf index 7c36b83d5..cc23b65d2 100644 --- a/plugins/rss/DockerfileCrossBuild.armhf +++ b/plugins/rss/DockerfileCrossBuild.armhf @@ -15,7 +15,8 @@ RUN apt-get update \ ADD . /etc/transmission-rss ENV TRANSMISSION_DOWNLOAD_DIR=/data/completed \ - RSS_URL=**None** + RSS_URL=**None** \ + RSS_REGEXP= CMD ["/etc/transmission-rss/start.sh"] diff --git a/plugins/rss/environment-variables.tmpl b/plugins/rss/environment-variables.tmpl index 1ee200cfc..4eaa64201 100644 --- a/plugins/rss/environment-variables.tmpl +++ b/plugins/rss/environment-variables.tmpl @@ -1,4 +1,5 @@ #! /bin/bash export TRANSMISSION_DOWNLOAD_DIR={{ .Env.TRANSMISSION_DOWNLOAD_DIR }} -export RSS_URL="{{ .Env.RSS_URL }}" \ No newline at end of file +export RSS_URL="{{ .Env.RSS_URL }}" +export RSS_REGEXP="{{ .Env.RSS_REGEXP }}" \ No newline at end of file diff --git a/plugins/rss/start.sh b/plugins/rss/start.sh index 348794f49..7c8fc9754 100755 --- a/plugins/rss/start.sh +++ b/plugins/rss/start.sh @@ -7,6 +7,9 @@ dockerize -template /etc/transmission-rss/environment-variables.tmpl:/etc/transm if [ -z "${RSS_URL}" ] || [ "${RSS_URL}" = "**None**" ] ; then echo "NO RSS URL CONFIGURED, IGNORING" else + if [ -z "${RSS_REGEXP}" ] ; then + sed -i 's/regexp:*//g' /etc/transmission-rss/transmission-rss.tmpl + fi dockerize -template /etc/transmission-rss/transmission-rss.tmpl:/etc/transmission-rss.conf echo "STARTING RSS PLUGIN" transmission-rss diff --git a/plugins/rss/transmission-rss.tmpl b/plugins/rss/transmission-rss.tmpl index d5dca3185..f419bb1ef 100644 --- a/plugins/rss/transmission-rss.tmpl +++ b/plugins/rss/transmission-rss.tmpl @@ -1,6 +1,8 @@ feeds: - url: {{ .Env.RSS_URL }} download_path: {{ .Env.TRANSMISSION_DOWNLOAD_DIR }} + regexp: {{ .Env.RSS_REGEXP }} + server: host: transmission port: 9091