From 7c5dd6ffb85f208632f7a2018a922b5ef2083c18 Mon Sep 17 00:00:00 2001 From: anoadragon453 Date: Tue, 22 Mar 2022 16:30:53 +0000 Subject: deploy: 6b26536a52f77aa5573b4d2afedae448fac31b7c --- .../configuration/homeserver_sample_config.html | 44 ++++++++++++++++++++-- latest/usage/configuration/index.html | 2 +- .../usage/configuration/logging_sample_config.html | 2 +- .../configuration/user_authentication/index.html | 2 +- .../user_authentication/refresh_tokens.html | 2 +- .../user_authentication/single_sign_on/cas.html | 2 +- .../user_authentication/single_sign_on/index.html | 2 +- .../user_authentication/single_sign_on/saml.html | 2 +- 8 files changed, 48 insertions(+), 10 deletions(-) (limited to 'latest/usage/configuration') diff --git a/latest/usage/configuration/homeserver_sample_config.html b/latest/usage/configuration/homeserver_sample_config.html index 263ad001f3..f932eb2955 100644 --- a/latest/usage/configuration/homeserver_sample_config.html +++ b/latest/usage/configuration/homeserver_sample_config.html @@ -99,7 +99,7 @@ @@ -2139,8 +2139,14 @@ saml2_config: # # localpart_template: Jinja2 template for the localpart of the MXID. # If this is not set, the user will be prompted to choose their -# own username (see 'sso_auth_account_details.html' in the 'sso' -# section of this file). +# own username (see the documentation for the +# 'sso_auth_account_details.html' template). This template can +# use the 'localpart_from_email' filter. +# +# confirm_localpart: Whether to prompt the user to validate (or +# change) the generated localpart (see the documentation for the +# 'sso_auth_account_details.html' template), instead of +# registering the account right away. # # display_name_template: Jinja2 template for the display name to set # on first login. If unset, no displayname will be set. @@ -2921,6 +2927,38 @@ redis: # Optional password if configured on the Redis instance # #password: <secret_password> + + +## Background Updates ## + +# Background updates are database updates that are run in the background in batches. +# The duration, minimum batch size, default batch size, whether to sleep between batches and if so, how long to +# sleep can all be configured. This is helpful to speed up or slow down the updates. +# +background_updates: + # How long in milliseconds to run a batch of background updates for. Defaults to 100. Uncomment and set + # a time to change the default. + # + #background_update_duration_ms: 500 + + # Whether to sleep between updates. Defaults to True. Uncomment to change the default. + # + #sleep_enabled: false + + # If sleeping between updates, how long in milliseconds to sleep for. Defaults to 1000. Uncomment + # and set a duration to change the default. + # + #sleep_duration_ms: 300 + + # Minimum size a batch of background updates can be. Must be greater than 0. Defaults to 1. Uncomment and + # set a size to change the default. + # + #min_batch_size: 10 + + # The batch size to use for the first iteration of a new background update. The default is 100. + # Uncomment and set a size to change the default. + # + #default_batch_size: 50 diff --git a/latest/usage/configuration/index.html b/latest/usage/configuration/index.html index 8666f6d93b..f22d1b98a0 100644 --- a/latest/usage/configuration/index.html +++ b/latest/usage/configuration/index.html @@ -99,7 +99,7 @@ diff --git a/latest/usage/configuration/logging_sample_config.html b/latest/usage/configuration/logging_sample_config.html index e229b4b90f..2ff9f9a5ca 100644 --- a/latest/usage/configuration/logging_sample_config.html +++ b/latest/usage/configuration/logging_sample_config.html @@ -99,7 +99,7 @@ diff --git a/latest/usage/configuration/user_authentication/index.html b/latest/usage/configuration/user_authentication/index.html index 2865ed69c6..ba63ded739 100644 --- a/latest/usage/configuration/user_authentication/index.html +++ b/latest/usage/configuration/user_authentication/index.html @@ -99,7 +99,7 @@ diff --git a/latest/usage/configuration/user_authentication/refresh_tokens.html b/latest/usage/configuration/user_authentication/refresh_tokens.html index 17482d8d0f..08821e5f1f 100644 --- a/latest/usage/configuration/user_authentication/refresh_tokens.html +++ b/latest/usage/configuration/user_authentication/refresh_tokens.html @@ -99,7 +99,7 @@ diff --git a/latest/usage/configuration/user_authentication/single_sign_on/cas.html b/latest/usage/configuration/user_authentication/single_sign_on/cas.html index e2be92a2f3..4d2b53c2f7 100644 --- a/latest/usage/configuration/user_authentication/single_sign_on/cas.html +++ b/latest/usage/configuration/user_authentication/single_sign_on/cas.html @@ -99,7 +99,7 @@ diff --git a/latest/usage/configuration/user_authentication/single_sign_on/index.html b/latest/usage/configuration/user_authentication/single_sign_on/index.html index 4c2465802a..40c3972f9e 100644 --- a/latest/usage/configuration/user_authentication/single_sign_on/index.html +++ b/latest/usage/configuration/user_authentication/single_sign_on/index.html @@ -99,7 +99,7 @@ diff --git a/latest/usage/configuration/user_authentication/single_sign_on/saml.html b/latest/usage/configuration/user_authentication/single_sign_on/saml.html index 9833c20c0c..84afb97810 100644 --- a/latest/usage/configuration/user_authentication/single_sign_on/saml.html +++ b/latest/usage/configuration/user_authentication/single_sign_on/saml.html @@ -99,7 +99,7 @@ -- cgit 1.5.1