From b3d6ca1af388b676b60d76abaefc58046c5dc85a Mon Sep 17 00:00:00 2001 From: MSWS Date: Wed, 19 Nov 2025 05:19:24 -0800 Subject: [PATCH] Revert "Re-enable blog, update kuma, re-enable VPN" This reverts commit f69e39b755784b7abf8bcab4c8c8137a66dc1f36. --- caddy/Caddyfile | 5 +---- disabled/blog/compose.yml | 33 +++++++++++++++++++++++++++++++++ immich/compose.yml | 4 ---- navidrome/compose.yml | 12 +++++++----- uptime/compose.yml | 2 +- 5 files changed, 42 insertions(+), 14 deletions(-) create mode 100644 disabled/blog/compose.yml diff --git a/caddy/Caddyfile b/caddy/Caddyfile index dd871ff..8e22630 100644 --- a/caddy/Caddyfile +++ b/caddy/Caddyfile @@ -64,16 +64,13 @@ 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 diff --git a/disabled/blog/compose.yml b/disabled/blog/compose.yml new file mode 100644 index 0000000..27f77c6 --- /dev/null +++ b/disabled/blog/compose.yml @@ -0,0 +1,33 @@ +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: diff --git a/immich/compose.yml b/immich/compose.yml index 5479f3b..0549d62 100644 --- a/immich/compose.yml +++ b/immich/compose.yml @@ -41,10 +41,6 @@ services: restart: always networks: - immich-internal - deploy: - resources: - limits: - cpus: '1' redis: container_name: immich_redis diff --git a/navidrome/compose.yml b/navidrome/compose.yml index 42b1fe2..4b3984b 100644 --- a/navidrome/compose.yml +++ b/navidrome/compose.yml @@ -28,7 +28,7 @@ services: restart: always networks: - cloudflared - - torrent + - tor radarr: image: lscr.io/linuxserver/radarr:latest @@ -44,7 +44,7 @@ services: restart: always networks: - cloudflared - - torrent + - tor sonarr: image: lscr.io/linuxserver/sonarr:latest @@ -60,7 +60,7 @@ services: restart: always networks: - cloudflared - - torrent + - tor qbittorrent: image: lscr.io/linuxserver/qbittorrent:latest @@ -75,7 +75,9 @@ services: - "${PWD}/bittorrent/config" - "${PWD}/downloads:/downloads" restart: always - network_mode: "service:gluetun" + networks: + - cloudflared + - tor prowlarr: image: lscr.io/linuxserver/prowlarr:latest @@ -88,7 +90,7 @@ services: - ${PWD}/prowlar/config:/config restart: always networks: - - torrent + - tor - cloudflared gluetun: diff --git a/uptime/compose.yml b/uptime/compose.yml index 1496511..7c3c6bf 100644 --- a/uptime/compose.yml +++ b/uptime/compose.yml @@ -1,6 +1,6 @@ services: uptime-kuma: - image: louislam/uptime-kuma:2-slim + image: louislam/uptime-kuma:1 container_name: uptime-kuma restart: always volumes: