From 839c3467773cb2381e38f2244b0bf835552e2f37 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 18 Dec 2022 01:14:59 +0200 Subject: [PATCH] Mastodon: enable OIDC and disable elasticsearch (doesn't work for now) --- docker/mastodon/docker-compose.toml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/docker/mastodon/docker-compose.toml b/docker/mastodon/docker-compose.toml index 6f48373..e4ef79e 100644 --- a/docker/mastodon/docker-compose.toml +++ b/docker/mastodon/docker-compose.toml @@ -29,11 +29,22 @@ environment = [ "SMTP_PASSWORD", "SMTP_FROM_ADDRESS=social@korhonen.cc", "S3_ENABLED=false", - "ES_ENABLED=true", + "ES_ENABLED=false", "ES_HOST=elasticsearch", "ES_PORT=9200", "ES_USER=elastic", "ES_PASS=changeme", + "OIDC_ENABLED=true", + "OMNIAUTH_ONLY=true", + "OIDC_DISPLAY_NAME=Korhonen SSO", + "OIDC_DISCOVERY=true", + "OIDC_AUTH_ENDPOINT=https://sso.korhonen.cc/application/o/mastodon/.well-known/openid-configuration", + "OIDC_ISSUER=https://sso.korhonen.cc/application/o/mastodon/", + "OIDC_SCOPE=openid,profile,email", + "OIDC_UID_FIELD=preferred_username", + "OIDC_CLIENT_ID", + "OIDC_CLIENT_SECRET", + "OIDC_REDIRECT_URI=https://social.korhonen.cc/auth/auth/openid_connect/callback", ] networks = ["mastodon", "proxy", "postgres"] volumes = ["/docker/mastodon:/config"]