From 99b343e64dfedce65d398040e79c5c82c22871ed Mon Sep 17 00:00:00 2001 From: Fejy Date: Wed, 24 Sep 2025 02:17:16 +0000 Subject: [PATCH 1/2] Adding qbit3 Updating gluetun to use airvpn moving *arr services to a single stack --- arr/compose.yml | 109 ++++++++++++++++++++++++++++++++++++++++ pirate-ship/compose.yml | 33 +++++++++++- 2 files changed, 140 insertions(+), 2 deletions(-) create mode 100644 arr/compose.yml diff --git a/arr/compose.yml b/arr/compose.yml new file mode 100644 index 0000000..d6b0731 --- /dev/null +++ b/arr/compose.yml @@ -0,0 +1,109 @@ +services: + prowlarr: + image: lscr.io/linuxserver/prowlarr:latest + container_name: prowlarr + environment: + - PUID=1029 + - PGID=1000 + - TZ=Etc/UTC + volumes: + - /home/fejy/docker/prowlarr/data:/config + ports: + - 9696:9696 + restart: unless-stopped + networks: + - proxy + labels: + - "traefik.enable=true" + - "traefik.http.routers.prowlarr.rule=Host(`prowlarr.nearfuture`)" + - "traefik.http.routers.prowlarr.entrypoints=web" + + radarr: + image: lscr.io/linuxserver/radarr:latest + container_name: radarr + environment: + - PUID=1029 + - PGID=1000 + - TZ=Etc/UTC + volumes: + - /home/fejy/docker/radarr:/config + - /mnt/LUXURIA/Share:/Share + - /mnt/AVARITIA/Share:/Avaritia/Share + ports: + - 7878:7878 + restart: unless-stopped + networks: + - proxy + labels: + - "traefik.enable=true" + - "traefik.http.routers.radarr.rule=Host(`radarr.nearfuture`)" + - "traefik.http.routers.radarr.entrypoints=web" + + sonarr: + image: lscr.io/linuxserver/sonarr:latest + container_name: sonarr + environment: + - PUID=1029 + - PGID=1000 + - TZ=Etc/UTC + volumes: + - /home/fejy/docker/sonarr:/config + - /mnt/LUXURIA/Share:/Share + - /mnt/AVARITIA/Share:/Avaritia/Share + ports: + - 8989:8989 + restart: unless-stopped + networks: + - proxy + labels: + - "traefik.enable=true" + - "traefik.http.routers.sonarr.rule=Host(`sonarr.nearfuture`)" + - "traefik.http.routers.sonarr.entrypoints=web" + + overseerr: + image: lscr.io/linuxserver/overseerr:latest + container_name: overseerr + environment: + - PUID=1029 + - PGID=1000 + - TZ=Etc/UTC + volumes: + - /home/fejy/docker/overseerr:/config + ports: + - 5055:5055 + restart: unless-stopped + networks: + - proxy + labels: + - "traefik.enable=true" + - "traefik.http.routers.overseerr.rule=Host(`overseerr.nearfuture`)" + - "traefik.http.routers.overseerr.entrypoints=web" + - "traefik.http.routers.overseerr-ssl.rule=Host(`overseerr.nearfuture`)" + - "traefik.http.routers.overseerr-ssl.entrypoints=websecure" + - "traefik.http.routers.overseerr-ssl.tls=true" + + lidarr: + image: lscr.io/linuxserver/lidarr:latest + container_name: lidarr + environment: + - PUID=1029 + - PGID=1000 + - TZ=Etc/UTC + volumes: + - /home/fejy/docker/lidarr:/config + - /mnt/LUXURIA/Share:/Share + - /mnt/AVARITIA/Share:/Avaritia/Share + ports: + - 8686:8686 + restart: unless-stopped + networks: + - proxy + labels: + - "traefik.enable=true" + - "traefik.http.routers.lidarr.rule=Host(`lidarr.nearfuture`)" + - "traefik.http.routers.lidarr.entrypoints=web" + +networks: + proxy: + external: true + diff --git a/pirate-ship/compose.yml b/pirate-ship/compose.yml index 405429f..d7fc5cc 100644 --- a/pirate-ship/compose.yml +++ b/pirate-ship/compose.yml @@ -15,6 +15,7 @@ services: - 8388:8388/udp # Gluetun's built-in Shadowsocks server - 8089:8089/tcp # Qbittorrent web-ui - 8090:8090/tcp # Qbittorrent2 web-gui + - 8091:8091/tcp # Qbittorrent3 web-gui - 8069:8069/tcp # Qbittorrent_priv web-gui - 3000:3000 # Firefox desktop gui - 3001:3001 # Firefox desktop gui HTTPS @@ -22,14 +23,19 @@ services: - /home/fejy/docker/gluetun:/gluetun environment: # See https://github.com/qdm12/gluetun-wiki/tree/main/setup#setup - - VPN_SERVICE_PROVIDER=mullvad + - VPN_SERVICE_PROVIDER=airvpn - VPN_TYPE=wireguard # Wireguard: - WIREGUARD_PRIVATE_KEY=${WIREGUARD_PRIV_KEY} + - WIREGUARD_PRESHARED_KEY=${WIREGUARD_PSHARE_KEY} - WIREGUARD_ADDRESSES=${WIREGUARD_ADDR} - - SERVER_CITIES=Amsterdam + - SERVER_CITIES=Alblasserdam - HTTP_CONTROL_SERVER_ADDRESS=:8000 - HTTP_CONTROL_SERVER_LOG=ON + - DOT=off + - BLOCK_MALICIOUS=off + - BLOCK_SURVEILLANCE=off + - BLOCK_ADS=off restart: unless-stopped networks: - proxy @@ -47,6 +53,11 @@ services: - "traefik.http.routers.qbit2.entrypoints=web" - "traefik.http.routers.qbit2.service=qbit2" - "traefik.http.services.qbit2.loadbalancer.server.port=8090" + # Qbittorrent3 + - "traefik.http.routers.qbit3.rule=Host(`qbit3.nearfuture`)" + - "traefik.http.routers.qbit3.entrypoints=web" + - "traefik.http.routers.qbit3.service=qbit3" + - "traefik.http.services.qbit3.loadbalancer.server.port=8091" # Qbittorrent-priv - "traefik.http.routers.qbit-priv.rule=Host(`qbit-priv.nearfuture`)" - "traefik.http.routers.qbit-priv.entrypoints=web" @@ -91,6 +102,24 @@ services: condition: service_healthy restart: unless-stopped + qbittorrent3: + image: lscr.io/linuxserver/qbittorrent:latest + container_name: qbittorrent3 + environment: + - PUID=1029 + - PGID=1000 + - TZ=Etc/UTC + - WEBUI_PORT=8091 + volumes: + - /home/fejy/docker/qbittorrent3:/config + - /mnt/AVARITIA/Share:/Avaritia/Share + network_mode: "service:gluetun" + depends_on: + gluetun: + condition: service_healthy + restart: unless-stopped + + qbittorrent_priv: image: lscr.io/linuxserver/qbittorrent:latest container_name: qbittorrent_priv -- 2.49.0 From ccdfa80fe6a560ff866456e5ff7e31ce904dc444 Mon Sep 17 00:00:00 2001 From: Jeff Near Date: Sat, 28 Mar 2026 19:24:32 +0000 Subject: [PATCH 2/2] Updates Mar 28 2026 Adding new cross-seed instance Adding external access to excalidraw Updated matrix-bots to include R34 API info (in .env file) Prevent qbittorrent clients from auto-restarting Adding homepage url environment variable --- cross-seed/compose.yml | 34 ++++++++++++++++++++++++++++++++++ excalidraw/compose.yml | 11 +++++++++-- homepage/compose.yml | 1 + matrix-bots/compose.yml | 3 +++ pirate-ship/compose.yml | 8 ++++---- 5 files changed, 51 insertions(+), 6 deletions(-) diff --git a/cross-seed/compose.yml b/cross-seed/compose.yml index b4d8b23..146090c 100644 --- a/cross-seed/compose.yml +++ b/cross-seed/compose.yml @@ -33,6 +33,40 @@ services: - "traefik.enable=true" - "traefik.http.routers.cross-seed2.rule=Host(`cross-seed2.nearfuture`)" - "traefik.http.routers.cross-seed2.entrypoints=web" + cross-seed3: + image: ghcr.io/cross-seed/cross-seed:6 + container_name: cross-seed3 + user: 1029:1000 # this must match your torrent client (cross-seed does not support using PGID and PUID) + ports: + - "2470:2468" + volumes: + - /home/fejy/docker/cross-seed3:/config + - /mnt/AVARITIA/Share:/Avaritia/Share/ + command: daemon + restart: unless-stopped + networks: + - proxy + labels: + - "traefik.enable=true" + - "traefik.http.routers.cross-seed3.rule=Host(`cross-seed3.nearfuture`)" + - "traefik.http.routers.cross-seed3.entrypoints=web" + cross-seed-priv: + image: ghcr.io/cross-seed/cross-seed:6 + container_name: cross-seed-priv + user: 1029:1000 # this must match your torrent client (cross-seed does not support using PGID and PUID) + ports: + - "2471:2468" + volumes: + - /home/fejy/docker/cross-seed-priv:/config + - /mnt/LUXURIA/Private:/mnt/LUXURIA/Private + command: daemon + restart: unless-stopped + networks: + - proxy + labels: + - "traefik.enable=true" + - "traefik.http.routers.cross-seed-priv.rule=Host(`cross-seed-priv.nearfuture`)" + - "traefik.http.routers.cross-seed-priv.entrypoints=web" networks: diff --git a/excalidraw/compose.yml b/excalidraw/compose.yml index f1e9ded..9f50715 100644 --- a/excalidraw/compose.yml +++ b/excalidraw/compose.yml @@ -12,8 +12,15 @@ services: - proxy labels: - "traefik.enable=true" - - "traefik.http.routers.excalidraw.rule=Host(`excalidraw.nearfuture`)" - - "traefik.http.routers.excalidraw.entrypoints=web" + - "traefik.http.routers.ex.rule=Host(`excalidraw.nearfuture`)" + - "traefik.http.routers.ex.entrypoints=web" + - "traefik.http.routers.ex-ssl.rule=Host(`excalidraw.nearfuture`)" + - "traefik.http.routers.ex-ssl.entrypoints=websecure" + - "traefik.http.routers.ex-ssl.tls=true" + - "traefik.http.routers.ex-ssl-ext.rule=Host(`excalidraw.nearfuture.industries`)" + - "traefik.http.routers.ex-ssl-ext.entrypoints=websecure" + - "traefik.http.routers.ex-ssl-ext.tls=true" + networks: proxy: diff --git a/homepage/compose.yml b/homepage/compose.yml index 4c0e8f6..aaa6e3f 100644 --- a/homepage/compose.yml +++ b/homepage/compose.yml @@ -6,6 +6,7 @@ services: environment: PUID: 1029 # optional, your user id PGID: 994 # optional, your group id + HOMEPAGE_ALLOWED_HOSTS: home.nearfuture ports: - 3069:3000 volumes: diff --git a/matrix-bots/compose.yml b/matrix-bots/compose.yml index 732d5da..46d93d9 100644 --- a/matrix-bots/compose.yml +++ b/matrix-bots/compose.yml @@ -19,6 +19,9 @@ services: - /home/fejy/docker/matrix-bots/maubot/:/data:z ports: - 29316:29316 + environment: + R34_API_KEY: ${R34_API_KEY} + R34_UID: ${R34_UID} networks: - proxy restart: unless-stopped diff --git a/pirate-ship/compose.yml b/pirate-ship/compose.yml index d7fc5cc..6fdf775 100644 --- a/pirate-ship/compose.yml +++ b/pirate-ship/compose.yml @@ -81,7 +81,7 @@ services: depends_on: gluetun: condition: service_healthy - restart: unless-stopped + #restart: unless-stopped qbittorrent2: image: lscr.io/linuxserver/qbittorrent:latest @@ -100,7 +100,7 @@ services: depends_on: gluetun: condition: service_healthy - restart: unless-stopped + #restart: unless-stopped qbittorrent3: image: lscr.io/linuxserver/qbittorrent:latest @@ -117,7 +117,7 @@ services: depends_on: gluetun: condition: service_healthy - restart: unless-stopped + #restart: unless-stopped qbittorrent_priv: @@ -137,7 +137,7 @@ services: depends_on: gluetun: condition: service_healthy - restart: unless-stopped + #restart: unless-stopped mam-api: image: myanonamouse/seedboxapi -- 2.49.0