Merge pull request #135 from lpopov/master

Add additional room config options
This commit is contained in:
Slavi Pantaleev 2019-04-16 12:53:03 +03:00 committed by GitHub
commit ed00b0a77c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 0 deletions

View File

@ -797,3 +797,19 @@ matrix_appservice_discord_configuration_extension: "{{ matrix_appservice_irc_con
matrix_appservice_discord_configuration: "{{ matrix_appservice_discord_configuration_yaml|from_yaml|combine(matrix_appservice_discord_configuration_extension, recursive=True) }}" matrix_appservice_discord_configuration: "{{ matrix_appservice_discord_configuration_yaml|from_yaml|combine(matrix_appservice_discord_configuration_extension, recursive=True) }}"
# Controls whether searching the public room list is enabled.
matrix_enable_room_list_search: true
# Controls who's allowed to create aliases on this server.
matrix_alias_creation_rules:
- user_id: "*"
alias: "*"
room_id: "*"
action: allow
# Controls who can publish and which rooms can be published in the public room list.
matrix_room_list_publication_rules:
- user_id: "*"
alias: "*"
room_id: "*"
action: allow

View File

@ -1108,6 +1108,8 @@ push:
# #
#enable_room_list_search: false #enable_room_list_search: false
enable_room_list_search: {{ matrix_enable_room_list_search|to_json }}
# The `alias_creation` option controls who's allowed to create aliases # The `alias_creation` option controls who's allowed to create aliases
# on this server. # on this server.
# #
@ -1136,6 +1138,8 @@ push:
# room_id: "*" # room_id: "*"
# action: allow # action: allow
alias_creation_rules: {{ matrix_alias_creation_rules|to_json }}
# The `room_list_publication_rules` option controls who can publish and # The `room_list_publication_rules` option controls who can publish and
# which rooms can be published in the public room list. # which rooms can be published in the public room list.
# #
@ -1164,3 +1168,5 @@ push:
# alias: "*" # alias: "*"
# room_id: "*" # room_id: "*"
# action: allow # action: allow
room_list_publication_rules: {{ matrix_room_list_publication_rules|to_json }}