diff --git a/mastodon/docker-compose.yml b/mastodon/docker-compose.yml index baef37e..5c65175 100644 --- a/mastodon/docker-compose.yml +++ b/mastodon/docker-compose.yml @@ -55,25 +55,31 @@ services: - redis volumes: - /srv/mastodon/web:/mastodon/public/system - labels: - - "traefik.enable=true" - # Main Web Router - - "traefik.http.routers.mstdn-web-rtr.entrypoints=websecure" - - "traefik.http.routers.mstdn-web-rtr.rule=Host(`kvist.knast.cc`)" - - "traefik.http.routers.mstdn-web-rtr.tls=true" - - "traefik.http.routers.mstdn-web-rtr.tls.certResolver=letsencr" - # Media Router - - "traefik.http.routers.mstdn-media-rtr.entrypoints=websecure" - - "traefik.http.routers.mstdn-media-rtr.rule=(Host(`kvist.knast.cc`) && PathPrefix(`/system/media_attachments/`))" - - "traefik.http.routers.mstdn-media-rtr.tls=true" - - "traefik.http.routers.mstdn-media-rtr.tls.certResolver=letsencr" - - "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" + 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 + # labels: + # - "traefik.enable=true" + # # Main Web Router + # - "traefik.http.routers.mstdn-web-rtr.entrypoints=websecure" + # - "traefik.http.routers.mstdn-web-rtr.rule=Host(`kvist.knast.cc`)" + # - "traefik.http.routers.mstdn-web-rtr.tls=true" + # - "traefik.http.routers.mstdn-web-rtr.tls.certResolver=letsencr" + # # Media Router + # - "traefik.http.routers.mstdn-media-rtr.entrypoints=websecure" + # - "traefik.http.routers.mstdn-media-rtr.rule=(Host(`kvist.knast.cc`) && PathPrefix(`/system/media_attachments/`))" + # - "traefik.http.routers.mstdn-media-rtr.tls=true" + # - "traefik.http.routers.mstdn-media-rtr.tls.certResolver=letsencr" + # - "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: image: ghcr.io/mastodon/mastodon-streaming:v4.3.3 @@ -99,13 +105,19 @@ services: depends_on: - db - redis - 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" + 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 + # 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: