Merge commit '19675d2'
This commit is contained in:
commit
e48d000a66
1 changed files with 5 additions and 5 deletions
|
@ -117,7 +117,7 @@ bridge:
|
|||
# {displayname} is replaced with the displayname of the Signal user, which is the first
|
||||
# available variable in displayname_preference. The variables in displayname_preference
|
||||
# can also be used here directly.
|
||||
displayname_template: "{displayname} (Signal)"
|
||||
displayname_template: "{displayname}"
|
||||
# Whether or not contact list displaynames should be used.
|
||||
# Possible values: disallow, allow, prefer
|
||||
#
|
||||
|
@ -143,8 +143,8 @@ bridge:
|
|||
# Allow using double puppeting from any server with a valid client .well-known file.
|
||||
double_puppet_allow_discovery: false
|
||||
# Servers to allow double puppeting from, even if double_puppet_allow_discovery is false.
|
||||
double_puppet_server_map:
|
||||
example.com: https://example.com
|
||||
#double_puppet_server_map:
|
||||
# example.com: https://example.com
|
||||
# Shared secret for https://github.com/devture/matrix-synapse-shared-secret-auth
|
||||
#
|
||||
# If set, custom puppets will be enabled automatically for local users
|
||||
|
@ -152,8 +152,8 @@ bridge:
|
|||
# manually.
|
||||
# If using this for other servers than the bridge's server,
|
||||
# you must also set the URL in the double_puppet_server_map.
|
||||
login_shared_secret_map:
|
||||
example.com: foo
|
||||
#login_shared_secret_map:
|
||||
# example.com: foo
|
||||
# Whether or not created rooms should have federation enabled.
|
||||
# If false, created portal rooms will never be federated.
|
||||
federate_rooms: true
|
||||
|
|
Loading…
Reference in a new issue