Get back to gluetun, cleanup

docker/additional-stacks/homarr/homarr.yml

@@ -0,0 +1,18 @@
+services:
+  homarr:
+    container_name: homarr
+    image: ghcr.io/ajnart/homarr
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - ${APPS_DIR}/homarr/configs:/app/data/configs
+      - ${APPS_DIR}/homarr/icons:/app/public/icons
+      - ${APPS_DIR}/homarr/data:/data
+    networks:
+      - homarr
+    ports:
+      - '7575:7575'
+    restart: unless-stopped
+
+networks:
+  homarr:
+    name: homarr

docker/additional-stacks/joplin/joplin.yml

@@ -0,0 +1,43 @@
+services:
+    joplin-db:
+        image: postgres:16
+        container_name: joplin-db
+        volumes:
+            - ${APPS_DIR}/joplin/postgres:/var/lib/postgresql/data
+        networks:
+            - joplin
+        ports:
+            - "5432:5432"
+        restart: unless-stopped
+        environment:
+            - POSTGRES_PASSWORD=${JOPLIN_POSTGRES_PASSWORD}
+            - POSTGRES_USER=${JOPLIN_POSTGRES_USER}
+            - POSTGRES_DB=${JOPLIN_POSTGRES_DB}
+
+    joplin:
+        image: joplin/server
+        container_name: joplin
+        networks:
+            - proxy
+            - joplin
+        ports:
+            - "22300:22300"
+        environment:
+            - APP_PORT=22300
+            - APP_BASE_URL=${JOPLIN_BASE_URL}
+            - DB_CLIENT=pg
+            - POSTGRES_PASSWORD=${JOPLIN_POSTGRES_PASSWORD}
+            - POSTGRES_DATABASE=${JOPLIN_POSTGRES_DB}
+            - POSTGRES_USER=${JOPLIN_POSTGRES_USER}
+            - POSTGRES_PORT=5432
+            - POSTGRES_HOST=joplin-db
+        depends_on:
+            - joplin-db
+        restart: unless-stopped
+
+networks:
+  proxy:
+    external:
+        name: proxy
+  joplin:
+    name: joplin

docker/additional-stacks/qbittorrentvpn/qbittorrentvpn.yml

@@ -0,0 +1,33 @@
+   qbittorrentvpn:
+      image: binhex/arch-qbittorrentvpn
+      container_name: qbittorrentvpn
+      networks:
+         - media
+      cap_add:
+         - NET_ADMIN
+      environment:
+         - PUID=${PUID}
+         - PGID=${PGID}
+         - TZ=${TIMEZONE}
+         - VPN_ENABLED=yes
+         - VPN_PROV=custom
+         - VPN_CLIENT=wireguard
+         - ENABLE_PRIVOXY=no
+         - LAN_NETWORK=${LAN_NETWORK}
+         - NAME_SERVERS=1.1.1.1, 1.0.0.1
+         - WEBUI_PORT=8183
+         - DEBUG=true
+         - UMASK=000
+      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
+      restart: unless-stopped

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/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:
+   qbittorrent:
-      image: binhex/arch-qbittorrentvpn
+      image: linuxserver/qbittorrent
-      container_name: qbittorrentvpn
+      container_name: qbittorrent
-      networks:
-         - media
-      cap_add:
-         - NET_ADMIN
       environment:
-         - PUID=${PUID}
+        - PUID=${PUID}
-         - PGID=${PGID}
+        - PGID=${PGID}
-         - TZ=${TIMEZONE}
+        - TZ=${TIMEZONE}
-         - VPN_ENABLED=yes
+        - UMASK_SET=022
-         - VPN_PROV=custom
+        - WEBUI_PORT=8183
-         - VPN_CLIENT=wireguard
+      network_mode: "container:gluetun"
-         - ENABLE_PRIVOXY=yes
-         - LAN_NETWORK=${LAN_NETWORK}
-         - NAME_SERVERS=1.1.1.1, 1.0.0.1
-         - WEBUI_PORT=8183
-         - DEBUG=true
-         - UMASK=000
       volumes:
-         - ${APPS_DIR}/qbittorrentvpn:/config
+        - ${APPS_DIR}/qbittorrent/config:/config
-         - ${DATA_DIR}/downloads:/data
+        - ${DATA_DIR}/downloads:/downloads
-         - /etc/localtime:/etc/localtime:ro
+        - ${APPS_DIR}/qbittorrent/vuetorrent:/vuetorrent
-      ports:
-         - 8183:8183
-         - 8118:8118
-         - 6881:6881
-         - 6881:6881/udp
-      sysctls:
-         - "net.ipv4.conf.all.src_valid_mark=1"
-      privileged: true
       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