This commit is contained in:
msnie
2025-02-02 19:56:08 +01:00
parent 01287038ef
commit 4818a4263d
2 changed files with 13 additions and 19 deletions
+12 -18
View File
@@ -9,7 +9,7 @@ services:
healthcheck: healthcheck:
test: ["CMD", "pg_isready", "-U", "postgres"] test: ["CMD", "pg_isready", "-U", "postgres"]
volumes: volumes:
- ./postgres14:/var/lib/postgresql/data - /srv/mastodon/postgres14:/var/lib/postgresql/data
environment: environment:
- "POSTGRES_HOST_AUTH_METHOD=trust" - "POSTGRES_HOST_AUTH_METHOD=trust"
@@ -41,16 +41,13 @@ services:
- db - db
- redis - redis
volumes: volumes:
- /srv/mastodon/web/mastodon/public/system - /srv/mastodon/web:/mastodon/public/system
labels: labels:
- "traefik.enable=true" - traefik.enable=true
- "traefik.http.routers.mastodon.entrypoints=https" - traefik.http.routers.mastodonweb.rule=Host(`kvist.knast.cc`)
- "traefik.http.routers.mastodon.rule=(Host(`kvist.knast.cc`))" - traefik.http.routers.mastodonweb.entrypoints=websecure
- "traefik.http.routers.mastodon.tls=true" - traefik.http.routers.mastodonweb.tls.certresolver=letsencr
- "traefik.http.routers.mastodon.tls.certresolver=http" - traefik.http.services.mastodonweb.loadbalancer.server.port=3000
- "traefik.http.routers.mastodon.service=mastodon"
- "traefik.http.services.mastodon.loadbalancer.server.port=3000"
- "traefik.docker.network=proxy"
streaming: streaming:
image: ghcr.io/mastodon/mastodon-streaming:v4.3.3 image: ghcr.io/mastodon/mastodon-streaming:v4.3.3
@@ -70,14 +67,11 @@ services:
- db - db
- redis - redis
labels: labels:
- "traefik.enable=true" - traefik.enable=true
- "traefik.http.routers.mastodon-api.entrypoints=https" - traefik.http.routers.mastodonstreaming.rule=(Host(`kvist.knast.cc`) && PathPrefix(`/api/v1/streaming`))
- "traefik.http.routers.mastodon-api.rule=(Host(`kvist.knast.cc`) && PathPrefix(`/api/v1/streaming`))" - traefik.http.routers.mastodonstreaming.entrypoints=websecure
- "traefik.http.routers.mastodon-api.tls=true" - traefik.http.routers.mastodonstreaming.tls.certresolver=letsencr
- "traefik.http.routers.mastodon-api.tls.certresolver=http" - traefik.http.services.mastodonstreaming.loadbalancer.server.port=4000
- "traefik.http.routers.mastodon-api.service=mastodon-api"
- "traefik.http.services.mastodon-api.loadbalancer.server.port=4000"
- "traefik.docker.network=proxy"
sidekiq: sidekiq:
image: tootsuite/mastodon image: tootsuite/mastodon
+1 -1
View File
@@ -114,7 +114,7 @@ services:
- traefik.http.routers.mastodonstreaming.rule=(Host(`kvist.knast.cc`) && PathPrefix(`/api/v1/streaming`)) - traefik.http.routers.mastodonstreaming.rule=(Host(`kvist.knast.cc`) && PathPrefix(`/api/v1/streaming`))
- traefik.http.routers.mastodonstreaming.entrypoints=websecure - traefik.http.routers.mastodonstreaming.entrypoints=websecure
- traefik.http.routers.mastodonstreaming.tls.certresolver=letsencr - traefik.http.routers.mastodonstreaming.tls.certresolver=letsencr
- traefik.http.services.mastodonstreaming.loadbalancer.server.port=4433 - traefik.http.services.mastodonstreaming.loadbalancer.server.port=4000
# labels: # labels:
# - "traefik.enable=true" # - "traefik.enable=true"
# - "traefik.http.routers.mstdn-streamer-rtr.entrypoints=websecure" # - "traefik.http.routers.mstdn-streamer-rtr.entrypoints=websecure"