Get back to gluetun, cleanup

docker/stacks/collabora/collabora.yml

@@ -1,6 +1,6 @@
 services:
   collabora:
-    image: collabora/code
+    image: collabora/code:24.04.6.1.1
     container_name: collabora
     environment:
       - password=${COLLABORA_PASSWORD}

docker/stacks/ghostfolio/ghostfolio.yml

@@ -1,46 +0,0 @@
-services:
-  ghostfolio:
-    image: ghostfolio/ghostfolio
-    container_name: ghostfolio
-    environment:
-      DATABASE_URL: ${GHOSTFOLIO_DB_URL}
-      NODE_ENV: production
-      REDIS_HOST: ghostfolio-cache
-      REDIS_PASSWORD: ${GHOSTFOLIO_REDIS_PASSWORD}
-      REDIS_PORT: 6379
-      JWT_SECRET_KEY: ${GHOSTFOLIO_JWT_SECRET_KEY}
-      ACCESS_TOKEN_SALT: ${GHOSTFOLIO_ACCESS_TOKEN_SALT}
-    ports:
-      - 3333:3333
-    networks:
-      - ghostfolio
-      - proxy
-    depends_on:
-      - ghostfolio-db
-      - ghostfolio-cache
-
-  ghostfolio-db:
-    image: postgres:15
-    container_name: ghostfolio-db
-    volumes:
-      - ${APPS_DIR}/ghostfolio/postgres:/var/lib/postgresql/data
-    networks:
-      - ghostfolio
-    environment:
-      - POSTRES_DB=${GHOSTFOLIO_DB}
-      - POSTGRES_USER=${GHOSTFOLIO_DB_USER}
-      - POSTGRES_PASSWORD=${GHOSTFOLIO_DB_PASSWORD}
-
-  ghostfolio-cache:
-    image: redis:alpine
-    container_name: ghostfolio-cache
-    networks:
-      - ghostfolio
-    command: ['redis-server', '--requirepass', $GHOSTFOLIO_REDIS_PASSWORD]
-
-networks:
-  ghostfolio:
-    name: ghostfolio
-  proxy:
-    external:
-      name: proxy

docker/stacks/gluetun/gluetun.yml

@@ -0,0 +1,20 @@
+services:
+  gluetun:
+    image: qmcgaw/gluetun:v3.38
+    container_name: gluetun
+    cap_add:
+      - NET_ADMIN
+    environment:
+      - VPN_SERVICE_PROVIDER=custom
+      - VPN_TYPE=wireguard
+    volumes:
+      - ${APPS_DIR}/gluetun:/gluetun
+    networks:
+      - gluetun
+    ports:
+      # qbittorrent
+      - '8183:8183'
+
+networks:
+  gluetun:
+    name: gluetun

docker/stacks/media/media.yml

@@ -16,6 +16,7 @@ services:
          - ${APPS_DIR}/jellyfin:/config
          - ${DATA_DIR}/media/movies:/data/movies:ro
          - ${DATA_DIR}/media/tvshows:/data/tvshows:ro
+         - ${DATA_DIR}/media/music:/data/music:ro
       ports:
          - 8096:8096
       devices:
@@ -36,7 +37,7 @@ services:
          - ${DATA_DIR}/media/music:/media
    
    radarr:
-      image: lscr.io/linuxserver/radarr:4.3.2
+      image: lscr.io/linuxserver/radarr
       container_name: radarr
       networks:
          - media
@@ -129,38 +130,20 @@ services:
          - 8686:8686
       restart: unless-stopped      
 
-   qbittorrentvpn:
-      image: binhex/arch-qbittorrentvpn
-      container_name: qbittorrentvpn
-      networks:
-         - media
-      cap_add:
-         - NET_ADMIN
+   qbittorrent:
+      image: linuxserver/qbittorrent
+      container_name: qbittorrent
       environment:
-         - PUID=${PUID}
-         - PGID=${PGID}
-         - TZ=${TIMEZONE}
-         - VPN_ENABLED=yes
-         - VPN_PROV=custom
-         - VPN_CLIENT=wireguard
-         - ENABLE_PRIVOXY=yes
-         - LAN_NETWORK=${LAN_NETWORK}
-         - NAME_SERVERS=1.1.1.1, 1.0.0.1
-         - WEBUI_PORT=8183
-         - DEBUG=true
-         - UMASK=000
+        - PUID=${PUID}
+        - PGID=${PGID}
+        - TZ=${TIMEZONE}
+        - UMASK_SET=022
+        - WEBUI_PORT=8183
+      network_mode: "container:gluetun"
       volumes:
-         - ${APPS_DIR}/qbittorrentvpn:/config
-         - ${DATA_DIR}/downloads:/data
-         - /etc/localtime:/etc/localtime:ro
-      ports:
-         - 8183:8183
-         - 8118:8118
-         - 6881:6881
-         - 6881:6881/udp
-      sysctls:
-         - "net.ipv4.conf.all.src_valid_mark=1"
-      privileged: true
+        - ${APPS_DIR}/qbittorrent/config:/config
+        - ${DATA_DIR}/downloads:/downloads
+        - ${APPS_DIR}/qbittorrent/vuetorrent:/vuetorrent
       restart: unless-stopped
 
    ytdl-material:

docker/stacks/widmocc/widmocc.yml

@@ -0,0 +1,17 @@
+services:
+   widmocc:
+      image: mrvercetti/widmocc
+      container_name: widmocc
+      networks:
+         - widmocc
+         - proxy
+      ports:
+         - 1313:80
+      restart: unless-stopped
+
+networks:
+   proxy:
+      external:
+         name: proxy
+   widmocc:
+      name: widmocc