From c0b29f5f9c504b2d617e92df66a635049c800a67 Mon Sep 17 00:00:00 2001
From: msnie <msnie@dtu.dk>
Date: Sun, 2 Feb 2025 00:52:02 +0100
Subject: [PATCH] mastodon

---
 mastodon/docker-compose.latest.yml      | 28 ++++++++++---------------
 mastodon/docker-compose.linuxserver.yml |  3 +--
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/mastodon/docker-compose.latest.yml b/mastodon/docker-compose.latest.yml
index b5aec17..87a4cbb 100644
--- a/mastodon/docker-compose.latest.yml
+++ b/mastodon/docker-compose.latest.yml
@@ -1,3 +1,5 @@
+# This file is designed for production server deployment, not local development work
+# For a containerized local dev environment, see: https://github.com/mastodon/mastodon/blob/main/docs/DEVELOPMENT.md#docker
 
 services:
   db:
@@ -9,6 +11,7 @@ services:
     healthcheck:
       test: ['CMD', 'pg_isready', '-U', 'postgres']
     volumes:
+      # - ./postgres14:/var/lib/postgresql/data
       - /srv/mastodon/postgres14:/var/lib/postgresql/data
     environment:
       - 'POSTGRES_HOST_AUTH_METHOD=trust'
@@ -21,6 +24,7 @@ services:
     healthcheck:
       test: ['CMD', 'redis-cli', 'ping']
     volumes:
+      # - ./redis:/data
       - /srv/mastodon/redis:/data
 
   # es:
@@ -64,24 +68,19 @@ services:
     networks:
       - traefik
       - internal_network
-
     healthcheck:
       # prettier-ignore
-      test: ['CMD-SHELL',"curl -s --noproxy localhost localhost:3344/health | grep -q 'OK' || exit 1"]
+      test: ['CMD-SHELL',"curl -s --noproxy localhost localhost:3000/health | grep -q 'OK' || exit 1"]
     ports:
-      - '127.0.0.1:3344:3000'
+      - '127.0.0.1:3000:3000'
     depends_on:
       - db
       - redis
       # - es
     volumes:
+      # - ./public/system:/mastodon/public/system
+      # /mastodon/public/system
       - /srv/mastodon/web:/mastodon/public/system
-    labels:
-      - traefik.enable=true
-      - traefik.http.routers.mastodonweb.rule=Host(`kvist.knast.cc`)
-      - traefik.http.routers.mastodonweb.entrypoints=websecure
-      - traefik.http.routers.mastodonweb.tls.certresolver=letsencr
-      - traefik.http.services.mastodonweb.loadbalancer.server.port=3344
 
   streaming:
     # You can uncomment the following lines if you want to not use the prebuilt image, for example if you have local code changes
@@ -97,18 +96,12 @@ services:
       - internal_network
     healthcheck:
       # prettier-ignore
-      test: ['CMD-SHELL', "curl -s --noproxy localhost localhost:4433/api/v1/streaming/health | grep -q 'OK' || exit 1"]
+      test: ['CMD-SHELL', "curl -s --noproxy localhost localhost:4000/api/v1/streaming/health | grep -q 'OK' || exit 1"]
     ports:
-      - '127.0.0.1:4433:4000'
+      - '127.0.0.1:4000:4000'
     depends_on:
       - db
       - redis
-    labels:
-      - traefik.enable=true
-      - traefik.http.routers.mastodonstreaming.rule=(Host(`kvist.knast.cc`) && PathPrefix(`/api/v1/streaming`))
-      - traefik.http.routers.mastodonstreaming.entrypoints=websecure
-      - traefik.http.routers.mastodonstreaming.tls.certresolver=letsencr
-      - traefik.http.services.mastodonstreaming.loadbalancer.server.port=4433
 
   sidekiq:
     # You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes
@@ -124,6 +117,7 @@ services:
       - traefik
       - internal_network
     volumes:
+      # - ./public/system:/mastodon/public/system
       - /srv/mastodon/sidekiq:/mastodon/public/system
     healthcheck:
       test: ['CMD-SHELL', "ps aux | grep '[s]idekiq\ 6' || false"]
diff --git a/mastodon/docker-compose.linuxserver.yml b/mastodon/docker-compose.linuxserver.yml
index 3822a3e..054e6ae 100644
--- a/mastodon/docker-compose.linuxserver.yml
+++ b/mastodon/docker-compose.linuxserver.yml
@@ -14,8 +14,7 @@ services:
       - WEB_DOMAIN=kvist.knast.cc
       # 
       # - REDIS_HOST=redis
-      # - REDIS_URL=redis://redis:6379
-      - 'REDIS_URL=redis://redis:6379'
+      - REDIS_URL=redis://redis:6379
       - REDIS_PORT=6379
       # 
       - DB_HOST=db