diff options
| author | Erik Johnston <erikj@jki.re> | 2019-02-11 09:44:00 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-11 09:44:00 +0000 |
| commit | b201149c7e89ada2024913e2fb027b2a08561f44 (patch) | |
| tree | 607e685ef3b1e0449eb77628151ab595e6f1e5cd /synapse/config | |
| parent | Allow "unavailable" presence status for /sync (#4592) (diff) | |
| parent | Fix flake8 issues (diff) | |
| download | synapse-b201149c7e89ada2024913e2fb027b2a08561f44.tar.xz | |
Merge pull request #4420 from matrix-org/jaywink/openid-listener
New listener resource for the federation API "openid/userinfo" endpoint
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/server.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 268a43ff00..f0a60cc712 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -335,6 +335,11 @@ class ServerConfig(Config): - names: [federation] # Federation APIs compress: false + # # If federation is disabled synapse can still expose the open ID endpoint + # # to allow integrations to authenticate users + # - names: [openid] + # compress: false + # optional list of additional endpoints which can be loaded via # dynamic modules # additional_resources: @@ -356,6 +361,10 @@ class ServerConfig(Config): compress: true - names: [federation] compress: false + # # If federation is disabled synapse can still expose the open ID endpoint + # # to allow integrations to authenticate users + # - names: [openid] + # compress: false # Turn on the twisted ssh manhole service on localhost on the given # port. @@ -480,6 +489,7 @@ KNOWN_RESOURCES = ( 'keys', 'media', 'metrics', + 'openid', 'replication', 'static', 'webclient', |