From 5c1ee74fe78a03f8522c13c4fbcd15782199f6af Mon Sep 17 00:00:00 2001 From: DMRobertson Date: Thu, 7 Dec 2023 17:54:05 +0000 Subject: deploy: aa983c7b0f46db18bcafb5e78b447cfd096971a3 --- develop/usage/configuration/config_documentation.html | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'develop/usage/configuration/config_documentation.html') diff --git a/develop/usage/configuration/config_documentation.html b/develop/usage/configuration/config_documentation.html index 7e4d1575a6..ccb18e12af 100644 --- a/develop/usage/configuration/config_documentation.html +++ b/develop/usage/configuration/config_documentation.html @@ -548,12 +548,12 @@ will not be created). Defaults to None.
  • Note: The use of both path and port options for the same listener is not compatible.
  • The x_forwarded option defaults to true when using Unix sockets and can be omitted.
  • -
  • Other options that would not make sense to use with a UNIX socket, such as +
  • Other options that would not make sense to use with a UNIX socket, such as bind_addresses and tls will be ignored and can be removed.
  • mode: The file permissions to set on the UNIX socket. Defaults to 666
  • -
  • Note: Must be set as type: http (does not support metrics and manhole). +
  • Note: Must be set as type: http (does not support metrics and manhole). Also make sure that metrics is not included in resources -> names
  • Valid resource names are:

    @@ -2559,7 +2559,7 @@ per older versions of the Matrix specification. Defaults to false. Set to true t access tokens via a query parameter.

    **Enabling this option is considered insecure and is not recommended. **

    Example configuration:

    -
    use_appservice_legacy_authorization: true 
    +
    use_appservice_legacy_authorization: true
     

    macaroon_secret_key

    @@ -3245,7 +3245,7 @@ validation will fail without configuring audiences.
  • enabled: Defaults to true. Set to false to disable password authentication. Set to only_for_reauth to allow users with existing passwords to use them -to log in and reauthenticate, whilst preventing new users from setting passwords.
  • +to reauthenticate (not log in), whilst preventing new users from setting passwords.
  • localdb_enabled: Set to false to disable authentication against the local password database. This is ignored if enabled is false, and is only useful if you have other password_providers. Defaults to true.
  • @@ -3486,7 +3486,7 @@ alias creation on this server.

    This setting is an optional list of 0 or more rules. By default, no list is provided, meaning that all alias creations are permitted.

    Otherwise, requests to create aliases are matched against each rule in order. -The first rule that matches decides if the request is allowed or denied. If no +The first rule that matches decides if the request is allowed or denied. If no rule matches, the request is denied. In particular, this means that configuring an empty list of rules will deny every alias creation request.

    Each rule is a YAML object containing four fields, each of which is an optional string:

    @@ -3497,7 +3497,7 @@ an empty list of rules will deny every alias creation request.

  • action: either allow or deny. What to do with the request if the rule matches. Defaults to allow.
  • Each of the glob patterns is optional, defaulting to * ("match anything"). -Note that the patterns match against fully qualified IDs, e.g. against +Note that the patterns match against fully qualified IDs, e.g. against @alice:example.com, #room:example.com and !abcdefghijk:example.com instead of alice, room and abcedgghijk.

    Example configuration:

    @@ -3523,7 +3523,7 @@ alias_creation_rules: alias_creation_rules: - user_id: "@bad_user:example.com" action: deny - + - action: allow
    # Prevent aliases being created which point to a specific room.
    @@ -3585,7 +3585,7 @@ room_list_publication_rules:
     room_list_publication_rules:
       - user_id: "@bad_user:example.com"
         action: deny
    -    
    +
       - action: allow
     
    # Prevent publication of a specific room.
    @@ -3928,7 +3928,7 @@ giving each worker a unique worker_name.

    must be declared, in the same way as the listeners option in the shared config.

    Workers declared in stream_writers and instance_map -will need to include a replication listener here, in order to accept internal HTTP +will need to include a replication listener here, in order to accept internal HTTP requests from other workers.

    Example configuration:

    worker_listeners:
    -- 
    cgit 1.5.1