diff --git a/rtorrent-flood/Dockerfile b/rtorrent-flood/Dockerfile index 5a66b10..d1424f6 100644 --- a/rtorrent-flood/Dockerfile +++ b/rtorrent-flood/Dockerfile @@ -1,7 +1,6 @@ FROM wonderfall/node:stable MAINTAINER Wonderfall -ARG MEDIAINFO_VER=0.7.88 ARG RTORRENT_VER=0.9.6 ARG LIBTORRENT_VER=0.13.6 ARG FILEBOT_VER=4.7.2 @@ -30,49 +29,32 @@ RUN echo "@community https://nl.alpinelinux.org/alpine/v3.4/community" >> /etc/a binutils" \ && apk -U add \ ${BUILD_DEPS} \ - ffmpeg \ ca-certificates \ curl \ gzip \ zip \ unrar \ supervisor \ - geoip \ tini@community \ openjdk8-jre@community \ - && cd /tmp \ - && wget -q http://downloads.sourceforge.net/mktorrent/mktorrent-1.0.tar.gz \ - && tar xzvf mktorrent-1.0.tar.gz \ - && svn checkout http://svn.code.sf.net/p/xmlrpc-c/code/stable xmlrpc-c \ - && mkdir libtorrent rtorrent \ + && cd /tmp && mkdir libtorrent rtorrent \ && cd libtorrent && wget -qO- https://github.com/rakshasa/libtorrent/archive/${LIBTORRENT_VER}.tar.gz | tar xz --strip 1 \ && cd ../rtorrent && wget -qO- https://github.com/rakshasa/rtorrent/archive/${RTORRENT_VER}.tar.gz | tar xz --strip 1 \ && cd /tmp \ - && wget -q http://mediaarea.net/download/binary/mediainfo/${MEDIAINFO_VER}/MediaInfo_CLI_${MEDIAINFO_VER}_GNU_FromSource.tar.gz \ - && wget -q http://mediaarea.net/download/binary/libmediainfo0/${MEDIAINFO_VER}/MediaInfo_DLL_${MEDIAINFO_VER}_GNU_FromSource.tar.gz \ - && tar xzf MediaInfo_DLL_${MEDIAINFO_VER}_GNU_FromSource.tar.gz \ - && tar xzf MediaInfo_CLI_${MEDIAINFO_VER}_GNU_FromSource.tar.gz \ - && tar xzvf mktorrent-1.0.tar.gz \ - && cd /tmp/mktorrent-1.0 && make -j ${NB_CORES} && make install \ - && cd /tmp/MediaInfo_DLL_GNU_FromSource && ./SO_Compile.sh \ - && cd /tmp/MediaInfo_DLL_GNU_FromSource/ZenLib/Project/GNU/Library && make install \ - && cd /tmp/MediaInfo_DLL_GNU_FromSource/MediaInfoLib/Project/GNU/Library && make install \ - && cd /tmp/MediaInfo_CLI_GNU_FromSource && ./CLI_Compile.sh \ - && cd /tmp/MediaInfo_CLI_GNU_FromSource/MediaInfo/Project/GNU/CLI && make install \ - && cd /tmp/xmlrpc-c && ./configure && make -j ${NB_CORES} && make install \ - && cd /tmp/libtorrent && ./autogen.sh && ./configure \ - && make -j ${NB_CORES} && make install \ - && cd /tmp/rtorrent && ./autogen.sh && ./configure --with-xmlrpc-c \ - && make -j ${NB_CORES} && make install \ + && git clone https://github.com/mirror/xmlrpc-c.git \ + && git clone https://github.com/Rudde/mktorrent.git \ + && cd /tmp/mktorrent && make -j ${NB_CORES} && make install \ + && cd /tmp/xmlrpc-c/advanced && ./configure && make -j ${NB_CORES} && make install \ + && cd /tmp/libtorrent && ./autogen.sh && ./configure && make -j ${NB_CORES} && make install \ + && cd /tmp/rtorrent && ./autogen.sh && ./configure --with-xmlrpc-c && make -j ${NB_CORES} && make install \ + && strip -s /usr/local/bin/rtorrent \ + && strip -s /usr/local/bin/mktorrent \ && mkdir /filebot \ && wget -q http://downloads.sourceforge.net/project/filebot/filebot/FileBot_${FILEBOT_VER}/FileBot_${FILEBOT_VER}-portable.zip -P /tmp \ && unzip -q /tmp/FileBot_${FILEBOT_VER}-portable.zip -d /filebot \ - && strip -s /usr/local/bin/rtorrent \ - && strip -s /usr/local/bin/mediainfo \ && cd /usr && git clone https://github.com/jfurrow/flood && cd flood \ && npm install \ && apk del ${BUILD_DEPS} \ - && deluser svn && delgroup svnusers \ && rm -rf /var/cache/apk/* /tmp/* COPY config.js /usr/flood/ @@ -93,7 +75,6 @@ EXPOSE 3000 49184 49184/udp LABEL description="BitTorrent client with WebUI front-end" \ rtorrent="rTorrent BiTorrent client v$RTORRENT_VER" \ libtorrent="libtorrent v$LIBTORRENT_VER" \ - mediainfo="mediainfo v$MEDIAINFO_VER" \ filebot="Filebot v$FILEBOT_VER" CMD ["/sbin/tini","--","startup"] diff --git a/rtorrent-flood/config.js b/rtorrent-flood/config.js index 9d73a5b..3e6bb89 100644 --- a/rtorrent-flood/config.js +++ b/rtorrent-flood/config.js @@ -8,7 +8,7 @@ const CONFIG = { scgi: { host: 'localhost', port: 5000, - socket: false, + socket: true, socketPath: '/tmp/rtorrent.sock' } }; diff --git a/rtorrent-flood/rtorrent.rc b/rtorrent-flood/rtorrent.rc index bd0565d..38247a8 100644 --- a/rtorrent-flood/rtorrent.rc +++ b/rtorrent-flood/rtorrent.rc @@ -1,4 +1,5 @@ -scgi_port = 0.0.0.0:5000 +scgi_local = /tmp/rtorrent.sock + encoding_list = UTF-8 port_range = 49184-49184 port_random = no @@ -9,6 +10,7 @@ encryption = require,require_RC4,allow_incoming,try_outgoing use_udp_trackers = yes dht = off peer_exchange = no + min_peers = 1 max_peers = 100 min_peers_seed = 1 @@ -17,6 +19,8 @@ max_uploads = 15 schedule = watch_directory,1,1,"load_start=/data/.watch/*.torrent" schedule = untied_directory,5,5,"stop_untied=/data/.watch/*.torrent" -schedule = espace_disque_insuffisant,1,30,close_low_diskspace=500M +schedule = scgi_permission,0,0,"execute.nothrow=chmod,\"g+w,o=\",/tmp/rtorrent.sock" +schedule = insufficient_disk_space,1,30,close_low_diskspace=500M + system.method.set_key=event.download.finished,filebot,"execute={/usr/bin/postdl,$d.get_base_path=,$d.get_name=,$d.get_custom1=}" system.method.set_key=event.download.erased,filebot_cleaner,"execute={/usr/bin/postrm}" diff --git a/rtorrent-flood/startup b/rtorrent-flood/startup index 64062f0..5360bb3 100644 --- a/rtorrent-flood/startup +++ b/rtorrent-flood/startup @@ -11,6 +11,7 @@ mkdir -p /data/Media/Music sed -i -e "s//$FLOOD_SECRET/g" /usr/flood/config.js rm -f /data/.session/rtorrent.lock -chown -R torrent:torrent /data /home/torrent /filebot /usr/flood +touch /run/rtorrent.sock +chown -R torrent:torrent /run/rtorrent.sock /data /home/torrent /filebot /usr/flood exec /usr/bin/supervisord -c /etc/supervisord.conf diff --git a/rtorrent-flood/supervisord.ini b/rtorrent-flood/supervisord.ini index a2f1aa7..1f6fb28 100644 --- a/rtorrent-flood/supervisord.ini +++ b/rtorrent-flood/supervisord.ini @@ -7,12 +7,12 @@ directory=/home/torrent priority=2 redirect_stderr=true environment=HOME="/home/torrent",PWD="/home/torrent",LOGNAME="rtorrent",USER="torrent",TERM="xterm" -startsecs=5 command=rtorrent +autorestart=true [program:flood] user=torrent directory=/usr/flood +redirect_stderr=true command=/usr/flood/server/bin/www -autostart=true autorestart=true