From 7eccdc24b38cfa557efc02d0fddb4c27deb159d4 Mon Sep 17 00:00:00 2001
From: NightPumpkin <w.kremi@protonmail.com>
Date: Sat, 10 Apr 2021 16:51:57 +0200
Subject: [PATCH] modif rtorrent

---
 .../docker-compose.yml                        | 50 ++++++++++++++-----
 .../geoip-updater.env                         |  7 +++
 .../rtorrent-rutorrent.env                    | 36 +++++++++++++
 3 files changed, 81 insertions(+), 12 deletions(-)
 create mode 100644 docker-compose/openvpn-rutorrent-jackett-flaresolver-radarr-sonarr/geoip-updater.env
 create mode 100644 docker-compose/openvpn-rutorrent-jackett-flaresolver-radarr-sonarr/rtorrent-rutorrent.env

diff --git a/docker-compose/openvpn-rutorrent-jackett-flaresolver-radarr-sonarr/docker-compose.yml b/docker-compose/openvpn-rutorrent-jackett-flaresolver-radarr-sonarr/docker-compose.yml
index 0956043..8e6ba6b 100644
--- a/docker-compose/openvpn-rutorrent-jackett-flaresolver-radarr-sonarr/docker-compose.yml
+++ b/docker-compose/openvpn-rutorrent-jackett-flaresolver-radarr-sonarr/docker-compose.yml
@@ -1,5 +1,11 @@
 ## Discord Plex FR : https://discord.gg/ERpYMqS
-## Version 2021-02-26
+## Version 2021-04-10
+##
+## NOTE : ATENTION NE PAS BASCULER SUR L'IMAGE 
+## CRAZYMAX AVEC LES FICHIERS DE VOTRE ANCIENNE 
+##     CONFIG LINUXSERVER/RUTORRENT
+##
+
 version: '3'
       
 services: 
@@ -26,7 +32,7 @@ services:
      - 8.8.8.8
      - 9.9.9.9
     ports :
-     - 8585:80 # WebUI rutorrent
+     - 8080:8080 # WebUI rutorrent
      - 9117:9117 # WebUI jackett
      - 7878:7878 # WebUI radarr
      - 8989:8989 # WebUI sonarr
@@ -100,20 +106,40 @@ services:
       - LOG_LEVEL=info
     restart: unless-stopped
     
-  rutorrent:
-    image: ghcr.io/linuxserver/rutorrent:latest
-    container_name: rutorrent-vpn
+  rtorrent-rutorrent:
+    image: crazymax/rtorrent-rutorrent:latest
+    container_name: rutorrent-crazymax
+#    labels:
+#     - com.centurylinklabs.watchtower.enable=true
+    depends_on:
+      - vpn
+    env_file:
+      - "./rtorrent-rutorrent.env"
+    network_mode: "service:vpn"
+    volumes:
+      - "/volume1/docker/rutorrent/data:/data"
+      - "/volume1/docker/rutorrent/passwd:/passwd"
+      - "/volume1/docker/rutorrent/downloads:/downloads"
+    ulimits:
+      nproc: 65535
+      nofile:
+        soft: 32000
+        hard: 40000
     restart: unless-stopped
+    
+  geoip-updater:
+    image: crazymax/geoip-updater:latest
+    container_name: geoip-rutorrent-crazymax
     network_mode: "service:vpn"
 #    labels:
-#      - com.centurylinklabs.watchtower.enable=true
-    environment:
-     - PUID=1000
-     - PGID=100
-     - TZ=Europe/Paris
+#     - com.centurylinklabs.watchtower.enable=true
+    depends_on:
+      - rtorrent-rutorrent
     volumes:
-     - /volume1/docker/rutorrent-vpn/config:/config
-     - /volume1/docker/rutorrent-vpn/downloads:/downloads
+      - "/volume1/docker/rutorrent/data/geoip:/data"
+    env_file:
+      - "./geoip-updater.env"
+    restart: unless-stopped
         
 networks:
   vpn-network:
diff --git a/docker-compose/openvpn-rutorrent-jackett-flaresolver-radarr-sonarr/geoip-updater.env b/docker-compose/openvpn-rutorrent-jackett-flaresolver-radarr-sonarr/geoip-updater.env
new file mode 100644
index 0000000..7136706
--- /dev/null
+++ b/docker-compose/openvpn-rutorrent-jackett-flaresolver-radarr-sonarr/geoip-updater.env
@@ -0,0 +1,7 @@
+TZ=Europe/Paris
+EDITION_IDS=GeoLite2-City,GeoLite2-Country
+LICENSE_KEY=
+DOWNLOAD_PATH=/data
+SCHEDULE=0 0 * * 0
+LOG_LEVEL=info
+LOG_JSON=false
diff --git a/docker-compose/openvpn-rutorrent-jackett-flaresolver-radarr-sonarr/rtorrent-rutorrent.env b/docker-compose/openvpn-rutorrent-jackett-flaresolver-radarr-sonarr/rtorrent-rutorrent.env
new file mode 100644
index 0000000..b5a81bc
--- /dev/null
+++ b/docker-compose/openvpn-rutorrent-jackett-flaresolver-radarr-sonarr/rtorrent-rutorrent.env
@@ -0,0 +1,36 @@
+TZ=Europe/Paris
+PUID=1000
+PGID=1000
+
+MEMORY_LIMIT=256M
+UPLOAD_MAX_SIZE=16M
+OPCACHE_MEM_SIZE=128
+MAX_FILE_UPLOADS=50
+REAL_IP_FROM=0.0.0.0/32
+REAL_IP_HEADER=X-Forwarded-For
+LOG_IP_VAR=remote_addr
+
+XMLRPC_AUTHBASIC_STRING=rTorrent XMLRPC restricted access
+RUTORRENT_AUTHBASIC_STRING=ruTorrent restricted access
+WEBDAV_AUTHBASIC_STRING=WebDAV restricted access
+
+RT_LOG_LEVEL=info
+RT_LOG_EXECUTE=false
+RT_LOG_XMLRPC=false
+
+RU_REMOVE_CORE_PLUGINS=erasedata,httprpc
+RU_HTTP_USER_AGENT=Mozilla/5.0 (Windows NT 6.0; WOW64; rv:12.0) Gecko/20100101 Firefox/12.0
+RU_HTTP_TIME_OUT=30
+RU_HTTP_USE_GZIP=true
+RU_RPC_TIME_OUT=5
+RU_LOG_RPC_CALLS=false
+RU_LOG_RPC_FAULTS=true
+RU_PHP_USE_GZIP=false
+RU_PHP_GZIP_LEVEL=2
+RU_SCHEDULE_RAND=10
+RU_LOG_FILE=/data/rutorrent/rutorrent.log
+RU_DO_DIAGNOSTIC=true
+RU_SAVE_UPLOADED_TORRENTS=true
+RU_OVERWRITE_UPLOADED_TORRENTS=false
+RU_FORBID_USER_SETTINGS=false
+RU_LOCALE=UTF8