From 4818a4263d64aed4513e7a44b78474e8caede07c Mon Sep 17 00:00:00 2001
From: msnie <msnie@dtu.dk>
Date: Sun, 2 Feb 2025 19:56:08 +0100
Subject: [PATCH] mastodon

---
 mastodon/docker-compose.traefik.yml | 30 ++++++++++++-----------------
 mastodon/docker-compose.yml         |  2 +-
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/mastodon/docker-compose.traefik.yml b/mastodon/docker-compose.traefik.yml
index 1a3ed69..fd0d4a7 100644
--- a/mastodon/docker-compose.traefik.yml
+++ b/mastodon/docker-compose.traefik.yml
@@ -9,7 +9,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"
 
@@ -41,16 +41,13 @@ services:
       - db
       - redis
     volumes:
-      - /srv/mastodon/web/mastodon/public/system
+      - /srv/mastodon/web:/mastodon/public/system
     labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.mastodon.entrypoints=https"
-      - "traefik.http.routers.mastodon.rule=(Host(`kvist.knast.cc`))"
-      - "traefik.http.routers.mastodon.tls=true"
-      - "traefik.http.routers.mastodon.tls.certresolver=http"
-      - "traefik.http.routers.mastodon.service=mastodon"
-      - "traefik.http.services.mastodon.loadbalancer.server.port=3000"
-      - "traefik.docker.network=proxy"
+      - 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=3000
 
   streaming:
     image: ghcr.io/mastodon/mastodon-streaming:v4.3.3
@@ -70,14 +67,11 @@ services:
       - db
       - redis
     labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.mastodon-api.entrypoints=https"
-      - "traefik.http.routers.mastodon-api.rule=(Host(`kvist.knast.cc`) && PathPrefix(`/api/v1/streaming`))"
-      - "traefik.http.routers.mastodon-api.tls=true"
-      - "traefik.http.routers.mastodon-api.tls.certresolver=http"
-      - "traefik.http.routers.mastodon-api.service=mastodon-api"
-      - "traefik.http.services.mastodon-api.loadbalancer.server.port=4000"
-      - "traefik.docker.network=proxy"
+      - 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=4000
 
   sidekiq:
     image: tootsuite/mastodon
diff --git a/mastodon/docker-compose.yml b/mastodon/docker-compose.yml
index 3bb9efc..86f6e8d 100644
--- a/mastodon/docker-compose.yml
+++ b/mastodon/docker-compose.yml
@@ -114,7 +114,7 @@ services:
       - 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
+      - traefik.http.services.mastodonstreaming.loadbalancer.server.port=4000
     # labels: 
     #   - "traefik.enable=true"
     #   - "traefik.http.routers.mstdn-streamer-rtr.entrypoints=websecure"