diff --git a/.env b/.env index 219cb78..4fbf22b 100644 --- a/.env +++ b/.env @@ -13,6 +13,7 @@ MUSIC_PATH=${STORAGE_PATH}/media/music2 DOWNLOADS_PATH=${STORAGE_PATH}/download NZB_DOWNLOADS_PATH=${DOWNLOADS_PATH}/sabnzbd TORRENTS_SEED_PATH=${STORAGE_PATH}/seed +TORRENTS_WATCH_PATH=${DOWNLOADS_PATH}/watch DOCKER_STORAGE_PATH=/docker DOCKER_STORAGE_PATH_SLOW=${STORAGE_PATH}/docker-storage PHOTOS_STORAGE_PATH=/srv/dev-disk-by-uuid-2d34f1a9-4284-4cad-ae9a-f1ef36244201/photos @@ -114,3 +115,6 @@ HANDBRAKER_SERVER_EXTERNAL_PORT=9997 REDLIB_EXTERNAL_PORT=8088 SABNZBD_EXTERNAL_PORT=8081 SABNZBD_INTERNAL_PORT=8080 +QBITTORRENT_WEBUI_PORT=9092 +QBITTORRENT_WEBUI_EXTERNAL_PORT=${QBITTORRENT_WEBUI_PORT} +QBITTORRENT_WEBUI_INTERNAL_PORT=${QBITTORRENT_WEBUI_PORT} diff --git a/docker-compose.yml b/docker-compose.yml index 58a85b3..5e39462 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -192,32 +192,6 @@ services: caddy.reverse_proxy: "{{ upstreams 9000 }}" restart: unless-stopped - rtorrent: - image: binhex/arch-rtorrentvpn - container_name: rtorrent - volumes: - - "${DOCKER_STORAGE_PATH}/rtorrent/config:/config" - - "${DOCKER_STORAGE_PATH}/rtorrent/watch:/watch" - - ${STORAGE_PATH}/seed:/data - - /etc/localtime:/etc/localtime:ro - environment: - - PUID=${PUID} - - PGID=${PGID} - env_file: - - rtorrent.env - ports: - - "9080:9080" - - "9443:9443" - - "8118:8118" - - "6881:6881" - networks: - public: - ipv4_address: 192.168.240.9 - labels: - caddy: torrent.${DOMAIN} - caddy.reverse_proxy: "{{ upstreams 9080 }}" - restart: unless-stopped - webhook: image: ${REGISTRY_URL}/webhook container_name: webhook @@ -616,6 +590,35 @@ services: volumes: - ${DOCKER_STORAGE_PATH}/vaultwarden:/data restart: unless-stopped + + qbittorrent: + image: lscr.io/linuxserver/qbittorrent:latest + container_name: qbittorrent + environment: + - PUID=${PUID} + - PGID=${PGID} + - TZ=${TZ} + - WEBUI_PORT=${QBITTORRENT_WEBUI_PORT} + - TORRENTING_PORT=6881 + - DOCKER_MODS=ghcr.io/vuetorrent/vuetorrent-lsio-mod|linuxserver/mods:universal-apprise + volumes: + - ${DOCKER_STORAGE_PATH}/qbittorrent/appdata:/config + - "${DOWNLOADS_PATH}/sabnzbd:/downloads" + - "${TORRENTS_SEED_PATH}:/seed" + - ${TORRENTS_WATCH_PATH}:/watch + - /etc/localtime:/etc/localtime:ro + networks: + public: + ipv4_address: 192.168.240.55 + ports: + - ${QBITTORRENT_WEBUI_EXTERNAL_PORT}:${QBITTORRENT_WEBUI_INTERNAL_PORT} + - 6881:6881 + - 6881:6881/udp + labels: + caddy: qbt.${DOMAIN} + caddy.reverse_proxy: "{{ upstreams $QBITTORRENT_WEBUI_INTERNAL_PORT }}" + restart: unless-stopped + networks: diff --git a/services/sonarr.yml b/services/sonarr.yml index b6e8b38..57dcc3e 100644 --- a/services/sonarr.yml +++ b/services/sonarr.yml @@ -17,7 +17,6 @@ services: - "${ANIME_PATH}:/anime" - "${NZB_DOWNLOADS_PATH}:/downloads" - "${TORRENTS_SEED_PATH}:/seed" - - "${TORRENTS_SEED_PATH}/incomplete:/data/incomplete" restart: unless-stopped sonarr_anime: @@ -36,5 +35,4 @@ services: - "${ANIME_PATH}:/anime" - "${NZB_DOWNLOADS_PATH}:/downloads" - "${TORRENTS_SEED_PATH}:/seed" - - "${TORRENTS_SEED_PATH}/incomplete:/data/incomplete" restart: unless-stopped