From 60a023968237a396529f9b2e696b5a2c8e61cd7c Mon Sep 17 00:00:00 2001
From: Matthew Pomes <matthew.pomes@pm.me>
Date: Sat, 4 Oct 2025 16:54:36 -0500
Subject: [PATCH] Fix container naming

---
 docker-compose.yaml         | 6 ++++++
 jellyfin-compose.yaml       | 4 +++-
 nginx/sites-enabled/servarr | 3 ++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 1e631bf..27cd6e0 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -34,6 +34,7 @@ networks:
     external: false
 services:
   web:
+    container_name: nginx
     image: "nginx"
     restart: unless-stopped
     ports:
@@ -70,6 +71,7 @@ services:
       #   target: /usr/local/share/fonts/custom
       #   read_only: true
   certbot:
+    container_name: certbot
     image: certbot/certbot:latest
     volumes:
       - /data/certbot/www/:/var/www/certbot/:rw
@@ -89,6 +91,7 @@ services:
       - './authelia/:/config'
     logging: *logging
   minecraft:
+    container_name: minecraft
     image: itzg/minecraft-server:latest
     tty: true
     stdin_open: true
@@ -118,6 +121,7 @@ services:
       - "/data/mincraft/plugins:/plugins"
       - "/data/mincraft/config:/config"
   gitea:
+    container_name: gitea
     image: docker.gitea.com/gitea:1.24
     environment:
       - USER_UID=1000
@@ -133,6 +137,7 @@ services:
       - "222:22"
     logging: *logging
   gitea-runner:
+    container_name: gitea-runner
     image: docker.gitea.com/act_runner:latest
     restart: unless-stopped
     networks:
@@ -149,6 +154,7 @@ services:
     depends_on:
       - gitea
   gpodder:
+    container_name: gpodder
     image: gitea.loadingm.xyz/the10thwiz/gpodder-rs:latest
     environment:
       - ROCKET_SECRET_KEY=${GPODDER_SECRET_KEY}
diff --git a/jellyfin-compose.yaml b/jellyfin-compose.yaml
index 717537d..ddd60d0 100644
--- a/jellyfin-compose.yaml
+++ b/jellyfin-compose.yaml
@@ -1,6 +1,6 @@
 services:
   gluetun:
-    container_name: GlueTun-VPN
+    container_name: gluetun
     image: qmcgaw/gluetun
     cap_add:
       - NET_ADMIN
@@ -10,6 +10,8 @@ services:
       - 51820:51820/udp
       - 46931:46931
       - 46931:46931/udp
+    networks:
+      - jellyfin-int
     environment:
       - VPN_SERVICE_PROVIDER=custom
       - VPN_TYPE=wireguard
diff --git a/nginx/sites-enabled/servarr b/nginx/sites-enabled/servarr
index 0887dd4..ccc2a6b 100644
--- a/nginx/sites-enabled/servarr
+++ b/nginx/sites-enabled/servarr
@@ -13,7 +13,8 @@ server {
     location /qbt/ {
         # include /etc/nginx/snippets/proxy.conf;
         include /etc/nginx/snippets/authelia-authrequest.conf;
-        proxy_pass http://qbittorrent:8080/;
+        # proxy_pass http://qbittorrent:8080/;
+        proxy_pass http://gluetun:8080/;
         proxy_http_version 1.1;
         proxy_set_header   Host               $proxy_host;
         proxy_set_header   X-Forwarded-For    $proxy_add_x_forwarded_for;