This commit is contained in:
msnie
2025-01-31 20:53:33 +01:00
parent 4d6ad6b61e
commit 360f68f60a
+36 -24
View File
@@ -56,24 +56,30 @@ services:
volumes: volumes:
- /srv/mastodon/web:/mastodon/public/system - /srv/mastodon/web:/mastodon/public/system
labels: labels:
- "traefik.enable=true" - traefik.enable=true
# Main Web Router - traefik.http.routers.mastodonweb.rule=Host(`kvist.knast.cc`)
- "traefik.http.routers.mstdn-web-rtr.entrypoints=websecure" - traefik.http.routers.mastodonweb.entrypoints=websecure
- "traefik.http.routers.mstdn-web-rtr.rule=Host(`kvist.knast.cc`)" - traefik.http.routers.mastodonweb.tls.certresolver=letsencr
- "traefik.http.routers.mstdn-web-rtr.tls=true" - traefik.http.services.mastodonweb.loadbalancer.server.port=3344
- "traefik.http.routers.mstdn-web-rtr.tls.certResolver=letsencr" # labels:
# Media Router # - "traefik.enable=true"
- "traefik.http.routers.mstdn-media-rtr.entrypoints=websecure" # # Main Web Router
- "traefik.http.routers.mstdn-media-rtr.rule=(Host(`kvist.knast.cc`) && PathPrefix(`/system/media_attachments/`))" # - "traefik.http.routers.mstdn-web-rtr.entrypoints=websecure"
- "traefik.http.routers.mstdn-media-rtr.tls=true" # - "traefik.http.routers.mstdn-web-rtr.rule=Host(`kvist.knast.cc`)"
- "traefik.http.routers.mstdn-media-rtr.tls.certResolver=letsencr" # - "traefik.http.routers.mstdn-web-rtr.tls=true"
- "traefik.http.routers.mstdn-media-rtr.middlewares=mstdn-cors-media" # - "traefik.http.routers.mstdn-web-rtr.tls.certResolver=letsencr"
# CORS Middleware # # Media Router
- "traefik.http.middlewares.mstdn-cors-media.headers.contentSecurityPolicy=img-src *; media-src *;" # - "traefik.http.routers.mstdn-media-rtr.entrypoints=websecure"
- "traefik.http.middlewares.mstdn-cors-media.headers.accesscontrolallowheaders=*" # - "traefik.http.routers.mstdn-media-rtr.rule=(Host(`kvist.knast.cc`) && PathPrefix(`/system/media_attachments/`))"
- "traefik.http.middlewares.mstdn-cors-media.headers.accessControlAllowOriginList=*" # - "traefik.http.routers.mstdn-media-rtr.tls=true"
# Service # - "traefik.http.routers.mstdn-media-rtr.tls.certResolver=letsencr"
- "traefik.http.services.mstdn-web-svc.loadbalancer.server.port=3344" # - "traefik.http.routers.mstdn-media-rtr.middlewares=mstdn-cors-media"
# # CORS Middleware
# - "traefik.http.middlewares.mstdn-cors-media.headers.contentSecurityPolicy=img-src *; media-src *;"
# - "traefik.http.middlewares.mstdn-cors-media.headers.accesscontrolallowheaders=*"
# - "traefik.http.middlewares.mstdn-cors-media.headers.accessControlAllowOriginList=*"
# # Service
# - "traefik.http.services.mstdn-web-svc.loadbalancer.server.port=3344"
streaming: streaming:
image: ghcr.io/mastodon/mastodon-streaming:v4.3.3 image: ghcr.io/mastodon/mastodon-streaming:v4.3.3
@@ -100,12 +106,18 @@ services:
- db - db
- redis - redis
labels: labels:
- "traefik.enable=true" - traefik.enable=true
- "traefik.http.routers.mstdn-streamer-rtr.entrypoints=websecure" - traefik.http.routers.mastodonstreaming.rule=(Host(`kvist.knast.cc`) && PathPrefix(`/api/v1/streaming`))
- "traefik.http.routers.mstdn-streamer-rtr.rule=(Host(`kvist.knast.cc`) && PathPrefix(`/api/v1/streaming`))" - traefik.http.routers.mastodonstreaming.entrypoints=websecure
- "traefik.http.routers.mstdn-streamer-rtr.tls=true" - traefik.http.routers.mastodonstreaming.tls.certresolver=letsencr
- "traefik.http.routers.mstdn-streamer-rtr.tls.certResolver=letsencr" - traefik.http.services.mastodonstreaming.loadbalancer.server.port=4433
- "traefik.http.services.mstdn-streamer-svc.loadbalancer.server.port=4433" # labels:
# - "traefik.enable=true"
# - "traefik.http.routers.mstdn-streamer-rtr.entrypoints=websecure"
# - "traefik.http.routers.mstdn-streamer-rtr.rule=(Host(`kvist.knast.cc`) && PathPrefix(`/api/v1/streaming`))"
# - "traefik.http.routers.mstdn-streamer-rtr.tls=true"
# - "traefik.http.routers.mstdn-streamer-rtr.tls.certResolver=letsencr"
# - "traefik.http.services.mstdn-streamer-svc.loadbalancer.server.port=4433"
sidekiq: sidekiq: