From 74befe2cc40ce9a6413cd12dfe535dc6a1d05983 Mon Sep 17 00:00:00 2001 From: xataz Date: Wed, 22 Mar 2017 16:04:34 +0100 Subject: [PATCH] Add RTORRENT_SCGI variable for use scgi port (#158) * Feature(rtorrent-flood) : Add RTORRENT_SCGI variable for use scgi port * Fix rtorrent-flood --- rtorrent-flood/Dockerfile | 1 + rtorrent-flood/README.md | 1 + rtorrent-flood/run.sh | 5 +++++ 3 files changed, 7 insertions(+) diff --git a/rtorrent-flood/Dockerfile b/rtorrent-flood/Dockerfile index eeb0c62..e2e816d 100644 --- a/rtorrent-flood/Dockerfile +++ b/rtorrent-flood/Dockerfile @@ -9,6 +9,7 @@ ARG BUILD_CORES ENV UID=991 GID=991 \ FLOOD_SECRET=supersecret \ CONTEXT_PATH=/ \ + RTORRENT_SCGI=0 \ PKG_CONFIG_PATH=/usr/local/lib/pkgconfig RUN NB_CORES=${BUILD_CORES-`getconf _NPROCESSORS_CONF`} \ diff --git a/rtorrent-flood/README.md b/rtorrent-flood/README.md index ba9b14f..f98c1a8 100644 --- a/rtorrent-flood/README.md +++ b/rtorrent-flood/README.md @@ -21,6 +21,7 @@ - **GID** : group id (defaut : 991) - **FLOOD_SECRET** : flood secret key (defaut : mysupersecretkey) (CHANGE IT) - **CONTEXT_PATH** : context path (base_URI) (default : /) +- **RTORRENT_SCGI** : SCGI port (default : 0 for use local socket) - **PKG_CONFIG_PATH** : `/usr/local/lib/pkgconfig` (don't touch) #### Ports diff --git a/rtorrent-flood/run.sh b/rtorrent-flood/run.sh index 5319d79..a5a963b 100644 --- a/rtorrent-flood/run.sh +++ b/rtorrent-flood/run.sh @@ -15,4 +15,9 @@ rm -f /data/.session/rtorrent.lock mv /usr/flood /usr/fix && mv /usr/fix /usr/flood # fix strange bug chown -R $UID:$GID /data /home/torrent /tmp /filebot /usr/flood /flood-db /etc/s6.d +if [ ${RTORRENT_SCGI} -ne 0 ]; then + sed -i -e 's|^scgi_local.*$|scgi_port = 0.0.0.0:'${RTORRENT_SCGI}'|' /home/torrent/.rtorrent.rc + sed -i -e 's|socket: true,|socket: false,|' -e 's|port: 5000,|port: '${RTORRENT_SCGI}',|' /usr/flood/config.js +fi + exec su-exec $GID:$UID /bin/s6-svscan /etc/s6.d