Просмотр исходного кода

Deprecate matrix_synapse_spam_checker in favor of matrix_synapse_modules

pull/2848/head
Slavi Pantaleev 2 лет назад
Родитель
Сommit
d207edb304
3 измененных файлов: 1 добавлений и 21 удалений
  1. +0
    -6
      roles/custom/matrix-synapse/defaults/main.yml
  2. +1
    -1
      roles/custom/matrix-synapse/tasks/validate_config.yml
  3. +0
    -14
      roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2

+ 0
- 6
roles/custom/matrix-synapse/defaults/main.yml Просмотреть файл

@@ -952,12 +952,6 @@ matrix_synapse_default_room_version: "10"
# The upstream default is `false`, but we try to make Synapse less wasteful of resources, so we do things differently. # The upstream default is `false`, but we try to make Synapse less wasteful of resources, so we do things differently.
matrix_synapse_forget_rooms_on_leave: true matrix_synapse_forget_rooms_on_leave: true


# Controls the Synapse `spam_checker` setting.
#
# If a spam-checker extension is enabled, this variable's value is set automatically by the playbook during runtime.
# If not, you can also control its value manually.
matrix_synapse_spam_checker: []

# Controls the Synapse `modules` list. # Controls the Synapse `modules` list.
# You can define your own list of modules here. See the `modules` syntax in `homeserver.yaml.j2` # You can define your own list of modules here. See the `modules` syntax in `homeserver.yaml.j2`
# Certain Synapse extensions that you can enable below auto-inject themselves into `matrix_synapse_modules` at runtime. # Certain Synapse extensions that you can enable below auto-inject themselves into `matrix_synapse_modules` at runtime.


+ 1
- 1
roles/custom/matrix-synapse/tasks/validate_config.yml Просмотреть файл

@@ -66,7 +66,7 @@
- {'old': 'matrix_synapse_ext_s3_storage_provider_path', 'new': 'matrix_synapse_ext_s3_storage_provider_base_path'} - {'old': 'matrix_synapse_ext_s3_storage_provider_path', 'new': 'matrix_synapse_ext_s3_storage_provider_base_path'}
- {'old': 'matrix_synapse_send_federation', 'new': '<unnecessary - Synapse relies on federation_sender_instances now>'} - {'old': 'matrix_synapse_send_federation', 'new': '<unnecessary - Synapse relies on federation_sender_instances now>'}
- {'old': 'matrix_synapse_start_pushers', 'new': '<unnecessary - Synapse relies on pusher_instances now>'} - {'old': 'matrix_synapse_start_pushers', 'new': '<unnecessary - Synapse relies on pusher_instances now>'}
- {'old': 'matrix_synapse_spam_checker', 'new': '<superseded by matrix_synapse_modules>'}


- name: (Deprecation) Catch and report renamed settings in matrix_synapse_configuration_extension_yaml - name: (Deprecation) Catch and report renamed settings in matrix_synapse_configuration_extension_yaml
ansible.builtin.fail: ansible.builtin.fail:


+ 0
- 14
roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2 Просмотреть файл

@@ -2570,20 +2570,6 @@ push:
#group_unread_count_by_room: false #group_unread_count_by_room: false




# Spam checkers are third-party modules that can block specific actions
# of local users, such as creating rooms and registering undesirable
# usernames, as well as remote users by redacting incoming events.
#
# spam_checker:
#- module: "my_custom_project.SuperSpamChecker"
# config:
# example_option: 'things'
#- module: "some_other_project.BadEventStopper"
# config:
# example_stop_events_from: ['@bad:example.com']
spam_checker: {{ matrix_synapse_spam_checker|to_json }}


## Rooms ## ## Rooms ##


# Controls whether locally-created rooms should be end-to-end encrypted by # Controls whether locally-created rooms should be end-to-end encrypted by


Загрузка…
Отмена
Сохранить