From 6dffdc8daa248cc04f45e724022332d9d866f791 Mon Sep 17 00:00:00 2001
From: Rik Veenboer <rik.veenboer@gmail.com>
Date: Sat, 14 Feb 2026 10:00:15 +0100
Subject: [PATCH] replace surfshark with gluetun

---
 compose.caddy.yaml        |  1 +
 compose.gluetun.yaml      | 12 ++++++------
 compose.qbittorrent.yaml  |  4 ++--
 compose.transmission.yaml |  4 ++--
 compose.yaml              |  5 +----
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/compose.caddy.yaml b/compose.caddy.yaml
index e6f5de7..6b56b2e 100644
--- a/compose.caddy.yaml
+++ b/compose.caddy.yaml
@@ -30,3 +30,4 @@ services:
       interval: 30s
       timeout: 10s
       retries: 3
+
diff --git a/compose.gluetun.yaml b/compose.gluetun.yaml
index 0f2ed5e..f9a50f7 100644
--- a/compose.gluetun.yaml
+++ b/compose.gluetun.yaml
@@ -12,10 +12,10 @@ services:
       - REGION=Europe
       - SERVER_COUNTRIES=Netherlands
       - LOCAL_NETWORK=192.168.2.0/24
-      - TRANSMISSION_RPC_PORT=9091
+      - HTTPPROXY=on
     ports:
-      - 1080:1080
-      - 9091:9091
-      - 9092:9092
-      - 6881:6881
-      - 6881:6881/udp
+      - "18888:8888/tcp"   # HTTP proxy
+      - "9091:9091/tcp"    # Transmission Web UI
+      - "9092:9092/tcp"    # Transmission optional RPC port
+      - "6881:6881/tcp"    # BitTorrent TCP
+      - "6881:6881/udp"    # BitTorrent UDP
diff --git a/compose.qbittorrent.yaml b/compose.qbittorrent.yaml
index 7759acd..a326688 100644
--- a/compose.qbittorrent.yaml
+++ b/compose.qbittorrent.yaml
@@ -3,13 +3,12 @@ services:
     container_name: qbittorrent
     image: linuxserver/qbittorrent:5.0.1
     depends_on:
-      - surfshark
+      - gluetun
     environment:
       - PUID=1000
       - PGID=1000
       - TZ=Europe/Amsterdam
       - WEBUI_PORT=9092
-    network_mode: service:surfshark
     restart: unless-stopped
     volumes:
       - /opt/qbittorrent:/config
@@ -19,3 +18,4 @@ services:
       interval: 30s
       timeout: 10s
       retries: 3
+    network_mode: "service:gluetun"
diff --git a/compose.transmission.yaml b/compose.transmission.yaml
index a7d722d..3c7b038 100644
--- a/compose.transmission.yaml
+++ b/compose.transmission.yaml
@@ -3,12 +3,11 @@ services:
     container_name: transmission
     image: linuxserver/transmission:4.0.6
     depends_on:
-      - surfshark
+      - gluetun
     environment:
       - PUID=1000
       - PGID=1000
       - TZ=Europe/Amsterdam
-    network_mode: service:surfshark
     restart: unless-stopped
     volumes:
       - /opt/transmission:/config
@@ -19,3 +18,4 @@ services:
       interval: 30s
       timeout: 10s
       retries: 3
+    network_mode: "service:gluetun"
diff --git a/compose.yaml b/compose.yaml
index d7ccab2..c6f980e 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -57,9 +57,7 @@ include:
 
   # Network
   - compose.dns-ad-blocker.yaml
-  - compose.surfshark.yaml
-  # - compose.socks.yaml
-  # - compose.openvpn-server.yaml
+  - compose.gluetun.yaml
 
   # Backup
   - compose.rsnapshot.yaml
@@ -69,4 +67,3 @@ include:
   - compose.gitea.yaml
   - tesla-api/compose.yaml
   - goodwe/compose.yaml
-