Update docker-compose files from test system changes

docker-compose/downloaders.yml

@@ -1,64 +1,67 @@
-version: "3.9"
+# Downloaders Stack
+# VPN-routed download clients
+# Place in /opt/stacks/downloaders/docker-compose.yml
+
+# Service Access URLs:
+# - qBittorrent: https://qbit.${DOMAIN}
 
 services:
-  # VPN client for routing download client traffic through Surfshark
+  # Gluetun - VPN client (Surfshark)
+  # Routes download clients through VPN for security
   gluetun:
     image: qmcgaw/gluetun:latest
     container_name: gluetun
-    hostname: gluetun
+    restart: unless-stopped
     cap_add:
       - NET_ADMIN
     devices:
       - /dev/net/tun:/dev/net/tun
-    ports:
-      - "8081:8080"  # qBittorrent WebUI
-      - "6881:6881"  # qBittorrent torrent port
-      - "6881:6881/udp"
-      - "8888:8888/tcp"  # HTTP proxy
-      - "8388:8388/tcp"  # Shadowsocks
-      - "8388:8388/udp"
-    volumes:
-      - ${STACK_DIR}/gluetun:/gluetun
-    environment:
-      - VPN_SERVICE_PROVIDER=surfshark
-      - VPN_TYPE=openvpn
-      - OPENVPN_USER=${SURFSHARK_USER}
-      - OPENVPN_PASSWORD=${SURFSHARK_PASSWORD}
-      - SERVER_COUNTRIES=${VPN_COUNTRY:-Netherlands}
-      - FIREWALL_VPN_INPUT_PORTS=6881
-      - TZ=${TZ}
-      - UPDATER_PERIOD=24h
     networks:
       - homelab-network
       - traefik-network
+    ports:
+      - "8888:8888/tcp"  # HTTP proxy
+      - "8388:8388/tcp"  # Shadowsocks
+      - "8388:8388/udp"  # Shadowsocks
+      - "8081:8080"      # qBittorrent web UI
+      - "6881:6881"      # qBittorrent
+      - "6881:6881/udp"  # qBittorrent
+    volumes:
+      - ./gluetun:/gluetun
+    environment:
+      - VPN_SERVICE_PROVIDER=surfshark
+      - VPN_TYPE=openvpn
+      - OPENVPN_USER=${SURFSHARK_USERNAME}
+      - OPENVPN_PASSWORD=${SURFSHARK_PASSWORD}
+      - SERVER_COUNTRIES=${VPN_SERVER_COUNTRIES:-Netherlands}
+      - TZ=${TZ}
     labels:
+      - "homelab.category=downloaders"
+      - "homelab.description=VPN client for secure downloads"
       - "traefik.enable=true"
-      # qBittorrent routing through Gluetun
       - "traefik.http.routers.qbittorrent.rule=Host(`qbit.${DOMAIN}`)"
       - "traefik.http.routers.qbittorrent.entrypoints=websecure"
       - "traefik.http.routers.qbittorrent.tls=true"
-      - "traefik.http.routers.qbittorrent.tls.certresolver=letsencrypt"
       - "traefik.http.routers.qbittorrent.middlewares=authelia@docker"
       - "traefik.http.services.qbittorrent.loadbalancer.server.port=8080"
-    restart: unless-stopped
 
-  # Torrent client
+  # qBittorrent - Torrent client
+  # Routes through Gluetun VPN
   qbittorrent:
     image: lscr.io/linuxserver/qbittorrent:latest
     container_name: qbittorrent
-    hostname: qbittorrent
-    network_mode: "service:gluetun"  # Route through VPN
+    restart: unless-stopped
+    network_mode: "service:gluetun"  # Routes through VPN in same compose file
+    volumes:
+      - ./qbittorrent/config:/config
+      - /mnt/downloads:/downloads
     environment:
-      - PUID=${PUID}
-      - PGID=${PGID}
+      - PUID=${PUID:-1000}
+      - PGID=${PGID:-1000}
       - TZ=${TZ}
       - WEBUI_PORT=8080
-    volumes:
-      - ${STACK_DIR}/qbittorrent/config:/config
-      - ${MEDIA_DIR}/downloads:/downloads
     depends_on:
       - gluetun
-    restart: unless-stopped
 
 networks:
   homelab-network: