diff options
| author | MatMaul <MatMaul@users.noreply.github.com> | 2023-09-12 13:23:07 +0000 |
|---|---|---|
| committer | MatMaul <MatMaul@users.noreply.github.com> | 2023-09-12 13:23:07 +0000 |
| commit | 7f6d1eb5ddeaafc33fec1fb8b3e5f7efc9462f2c (patch) | |
| tree | 6df4ea5c7a71727e2780ca5efcd811d1df2b71e7 /latest/usage | |
| parent | deploy: 5c8870cb28cc98d0b7a310b5dd2fade7ff45743d (diff) | |
| download | synapse-7f6d1eb5ddeaafc33fec1fb8b3e5f7efc9462f2c.tar.xz | |
deploy: 1296e471c343e001cd6bec4f5395811b3e755116
Diffstat (limited to '')
| -rw-r--r-- | latest/usage/administration/admin_api/registration_tokens.html | 1 | ||||
| -rw-r--r-- | latest/usage/configuration/config_documentation.html | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/latest/usage/administration/admin_api/registration_tokens.html b/latest/usage/administration/admin_api/registration_tokens.html index d7f1fbe22b..74e5be1e20 100644 --- a/latest/usage/administration/admin_api/registration_tokens.html +++ b/latest/usage/administration/admin_api/registration_tokens.html @@ -147,6 +147,7 @@ </div> <h1 id="registration-tokens"><a class="header" href="#registration-tokens">Registration Tokens</a></h1> +<p><strong>Note:</strong> This API is disabled when MSC3861 is enabled. <a href="https://github.com/matrix-org/synapse/pull/15582">See #15582</a></p> <p>This API allows you to manage tokens which can be used to authenticate registration requests, as proposed in <a href="https://github.com/matrix-org/matrix-doc/blob/main/proposals/3231-token-authenticated-registration.md">MSC3231</a> diff --git a/latest/usage/configuration/config_documentation.html b/latest/usage/configuration/config_documentation.html index 9ac6706349..414593c55e 100644 --- a/latest/usage/configuration/config_documentation.html +++ b/latest/usage/configuration/config_documentation.html @@ -3071,6 +3071,7 @@ and then copy the "url" from the source of the event.)</li> to style the login flow according to the identity provider in question. See the <a href="https://spec.matrix.org/latest/">spec</a> for possible options here.</li> <li><code>server_url</code>: The URL of the CAS authorization endpoint.</li> +<li><code>protocol_version</code>: The CAS protocol version, defaults to none (version 3 is required if you want to use "required_attributes").</li> <li><code>displayname_attribute</code>: The attribute of the CAS response to use as the display name. If no name is given here, no displayname will be set.</li> <li><code>required_attributes</code>: It is possible to configure Synapse to only allow logins if CAS attributes @@ -3083,6 +3084,7 @@ All of the listed attributes must match for the login to be permitted.</li> <pre><code class="language-yaml">cas_config: enabled: true server_url: "https://cas-server.com" + protocol_version: 3 displayname_attribute: name required_attributes: userGroup: "staff" @@ -3478,6 +3480,16 @@ normally or via a kick or ban. Defaults to false.</p> <pre><code class="language-yaml">forget_rooms_on_leave: false </code></pre> <hr /> +<h3 id="exclude_rooms_from_sync"><a class="header" href="#exclude_rooms_from_sync"><code>exclude_rooms_from_sync</code></a></h3> +<p>A list of rooms to exclude from sync responses. This is useful for server +administrators wishing to group users into a room without these users being able +to see it from their client.</p> +<p>By default, no room is excluded.</p> +<p>Example configuration:</p> +<pre><code class="language-yaml">exclude_rooms_from_sync: + - !foo:example.com +</code></pre> +<hr /> <h2 id="opentracing"><a class="header" href="#opentracing">Opentracing</a></h2> <p>Configuration options related to Opentracing support.</p> <hr /> |