diff --git a/12_torrent/docker-compose.yml b/12_torrent/docker-compose.yml index af2b285..6f79ad5 100644 --- a/12_torrent/docker-compose.yml +++ b/12_torrent/docker-compose.yml @@ -1,56 +1,17 @@ services: - glueten: - image: qmcgaw/gluetun - cap_add: - - NET_ADMIN - - devices: - - /dev/net/tun - - environment: - - VPN_SERVICE_PROVIDER=private internet access - - OPENVPN_USER=${OPENVPN_USER} - - OPENVPN_PASSWORD=${OPENVPN_PASSWORD} - - SERVER_REGIONS=Netherlands - - PORT_FORWARDING=on - - TZ=Europe/Paris - - volumes: - - /home/docker/DenGate:/gluetun - - ports: - - 8085:8090 - - 52000-52100:52000-52100/udp - - networks: - vpn-network: - tan-network: - ipv4_address: 10.10.0.120 - - labels: - - traefik.enable=true - - traefik.docker.network=tan-network - - # qbittorrent - - traefik.http.routers.qbittorrent.rule=Host(`torrent.luckyden.org`) - - traefik.http.routers.qbittorrent.entrypoints=websecure - - traefik.http.routers.qbittorrent.tls.certresolver=cloudflare - - traefik.http.routers.qbittorrent.service=qbittorrent - - traefik.http.services.qbittorrent.loadbalancer.server.port=8090 - - restart: unless-stopped - - healthcheck: - test: ["CMD", "ping", "-c", "1", "1.1.1.1"] - interval: 1m - timeout: 10s - retries: 3 - qbittorrent: image: lscr.io/linuxserver/qbittorrent:latest restart: unless-stopped - network_mode: service:glueten + + networks: + tan-network: + ipv4_address: 10.10.0.120 + + ports: + - 8085:8090 + - 6881:6881 + - 6881:6881/udp environment: - PUID=1000 @@ -62,30 +23,13 @@ services: - /home/docker/BitDen/config:/config - /mnt/bindmounts/multimedia/Downloads:/downloads - depends_on: - glueten: - condition: service_healthy - - - neko: - image: ghcr.io/m1k1o/neko/firefox:latest - restart: unless-stopped - shm_size: 2gb - network_mode: service:glueten - - volumes: - - /home/docker/BrowDen/firefox:/home/neko/.mozilla/firefox - - environment: - - NEKO_WEBRTC_EPR=52000-52100 - - NEKO_WEBRTC_ICELITE=1 - - NEKO_WEBRTC_NAT1TO1=192.168.0.9 - - NEKO_MEMBER_MULTIUSER_USER_PASSWORD=${NEKO_USER_PASS} - - NEKO_MEMBER_MULTIUSER_ADMIN_PASSWORD=${NEKO_ADMIN_PASS} - - depends_on: - glueten: - condition: service_healthy + labels: + - traefik.enable=true + - traefik.docker.network=tan-network + - traefik.http.routers.qbittorrent.rule=Host(`torrent.luckyden.org`) + - traefik.http.routers.qbittorrent.entrypoints=websecure + - traefik.http.routers.qbittorrent.tls.certresolver=cloudflare + - traefik.http.services.qbittorrent.loadbalancer.server.port=8090 prowlarr: @@ -252,8 +196,29 @@ services: - /dev/dri:/dev/dri + neko: + image: ghcr.io/m1k1o/neko/firefox:latest + restart: unless-stopped + shm_size: 2gb + + networks: + tan-network: + ipv4_address: 10.10.0.128 + + ports: + - 52000-52100:52000-52100/udp + + volumes: + - /home/docker/BrowDen/firefox:/home/neko/.mozilla/firefox + + environment: + - NEKO_WEBRTC_EPR=52000-52100 + - NEKO_WEBRTC_ICELITE=1 + - NEKO_WEBRTC_NAT1TO1=192.168.0.9 + - NEKO_MEMBER_MULTIUSER_USER_PASSWORD=${NEKO_USER_PASS} + - NEKO_MEMBER_MULTIUSER_ADMIN_PASSWORD=${NEKO_ADMIN_PASS} + + networks: - vpn-network: - name: vpn-network tan-network: external: true