Revert "Revert "Re-enable blog, update kuma, re-enable VPN""

This reverts commit b3d6ca1af3.

caddy/Caddyfile

@@ -64,13 +64,16 @@ photos.local.msws.xyz, photos.msws.xyz {
   reverse_proxy immich_server:2283
 }
 
+torrent.local.msws.xyz {
+  reverse_proxy gluetun:8080
+}
+
 *.code.msws.xyz {
   handle_path /* {
     redir https://code.msws.xyz/proxy/{labels.3}{path}?{query} 302
   }
 }
 
-
 :80, :443 {
   handle_path /resume* {
     rewrite * /MSWS/Resume/main/Resume.pdf 

disabled/blog/compose.yml

@@ -1,33 +0,0 @@
-services:
-  chyrplite:
-    # image: ghcr.io/msws/docker-chyrp-lite:latest
-    image: docker.io/library/chryp-lite:test
-    container_name: chyrp-lite-default
-    restart: always
-    volumes:
-      - data:/data
-      - html:/var/www/html
-    networks:
-      - cloudflared
-      - chyrp_internal
-  database:
-    image: mariadb
-    restart: always
-    environment:
-      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
-      MYSQL_DATABASE: ${MYSQL_DATABASE}
-      MYSQL_USER: ${MYSQL_USER}
-      MYSQL_PASSWORD: ${MYSQL_PASSWORD}
-    volumes:
-      - dbdata:/var/lib/mysql
-    networks:
-      - chyrp_internal
-
-volumes:
-  data:
-  html:
-  dbdata:
-networks:
-  cloudflared:
-    external: true
-  chyrp_internal:

immich/compose.yml

@@ -41,6 +41,10 @@ services:
     restart: always
     networks:
       - immich-internal
+    deploy:
+      resources:
+        limits:
+          cpus: '1'
 
   redis:
     container_name: immich_redis

navidrome/compose.yml

@@ -28,7 +28,7 @@ services:
     restart: always
     networks:
       - cloudflared
-      - tor
+      - torrent
 
   radarr:
     image: lscr.io/linuxserver/radarr:latest
@@ -44,7 +44,7 @@ services:
     restart: always
     networks:
         - cloudflared
-        - tor
+        - torrent
 
   sonarr:
     image: lscr.io/linuxserver/sonarr:latest
@@ -60,7 +60,7 @@ services:
     restart: always
     networks:
         - cloudflared
-        - tor
+        - torrent
 
   qbittorrent:
     image: lscr.io/linuxserver/qbittorrent:latest
@@ -75,9 +75,7 @@ services:
       - "${PWD}/bittorrent/config"
       - "${PWD}/downloads:/downloads"
     restart: always
-    networks:
-      - cloudflared
-      - tor
+    network_mode: "service:gluetun"
 
   prowlarr:
     image: lscr.io/linuxserver/prowlarr:latest
@@ -90,7 +88,7 @@ services:
       - ${PWD}/prowlar/config:/config
     restart: always
     networks:
-      - tor
+      - torrent
       - cloudflared
 
   gluetun:

uptime/compose.yml

@@ -1,6 +1,6 @@
 services:
   uptime-kuma:
-    image: louislam/uptime-kuma:1
+    image: louislam/uptime-kuma:2-slim
     container_name: uptime-kuma
     restart: always
     volumes: