Get back to gluetun, cleanup

docker/additional-stacks/ghostfolio/ghostfolio.yml

@@ -0,0 +1,46 @@
+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/additional-stacks/gluetun/gluetun.yml

@@ -1,20 +0,0 @@
-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/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