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

Merge pull request #1567 from aaronraimist/antispam

Upgrade synapse-simple-antispam (0.0.3 -> 0.0.7)
pull/1568/head
Slavi Pantaleev 4 лет назад
committed by GitHub
Родитель
Сommit
bcfae766a1
Не найден GPG ключ соответствующий данной подписи Идентификатор GPG ключа: 4AEE18F83AFDEB23
3 измененных файлов: 7 добавлений и 4 удалений
  1. +3
    -1
      roles/matrix-synapse/defaults/main.yml
  2. +2
    -2
      roles/matrix-synapse/tasks/ext/synapse-simple-antispam/setup_install.yml
  3. +2
    -1
      roles/matrix-synapse/templates/synapse/homeserver.yaml.j2

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

@@ -517,7 +517,7 @@ matrix_synapse_ext_password_provider_ldap_default_domain: ""
# See: https://github.com/t2bot/synapse-simple-antispam # See: https://github.com/t2bot/synapse-simple-antispam
matrix_synapse_ext_spam_checker_synapse_simple_antispam_enabled: false matrix_synapse_ext_spam_checker_synapse_simple_antispam_enabled: false
matrix_synapse_ext_spam_checker_synapse_simple_antispam_git_repository_url: "https://github.com/t2bot/synapse-simple-antispam" matrix_synapse_ext_spam_checker_synapse_simple_antispam_git_repository_url: "https://github.com/t2bot/synapse-simple-antispam"
matrix_synapse_ext_spam_checker_synapse_simple_antispam_git_version: "923ca5c85b08f157181721abbae50dd89c31e4b5"
matrix_synapse_ext_spam_checker_synapse_simple_antispam_git_version: "5ab711971e3a4541a7a40310ff85e17f8262cc05"
matrix_synapse_ext_spam_checker_synapse_simple_antispam_config_blocked_homeservers: [] matrix_synapse_ext_spam_checker_synapse_simple_antispam_config_blocked_homeservers: []


# Enable this to activate the Mjolnir Antispam spam-checker module. # Enable this to activate the Mjolnir Antispam spam-checker module.
@@ -580,6 +580,8 @@ matrix_synapse_default_room_version: "6"
# If not, you can also control its value manually. # If not, you can also control its value manually.
matrix_synapse_spam_checker: [] matrix_synapse_spam_checker: []


matrix_synapse_modules: []

matrix_synapse_encryption_enabled_by_default_for_room_type: off matrix_synapse_encryption_enabled_by_default_for_room_type: off


matrix_synapse_trusted_key_servers: matrix_synapse_trusted_key_servers:


+ 2
- 2
roles/matrix-synapse/tasks/ext/synapse-simple-antispam/setup_install.yml Просмотреть файл

@@ -38,8 +38,8 @@
become_user: "{{ matrix_user_username }}" become_user: "{{ matrix_user_username }}"


- set_fact: - set_fact:
matrix_synapse_spam_checker: >
{{ matrix_synapse_spam_checker }}
matrix_synapse_modules: >
{{ matrix_synapse_modules }}
+ +
[{ [{
"module": "synapse_simple_antispam.AntiSpamInvites", "module": "synapse_simple_antispam.AntiSpamInvites",


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

@@ -15,12 +15,13 @@
# See https://matrix-org.github.io/synapse/latest/modules/index.html for more # See https://matrix-org.github.io/synapse/latest/modules/index.html for more
# documentation on how to configure or create custom modules for Synapse. # documentation on how to configure or create custom modules for Synapse.
# #
modules:
#modules:
# - module: my_super_module.MySuperClass # - module: my_super_module.MySuperClass
# config: # config:
# do_thing: true # do_thing: true
# - module: my_other_super_module.SomeClass # - module: my_other_super_module.SomeClass
# config: {} # config: {}
modules: {{ matrix_synapse_modules|to_json }}




## Server ## ## Server ##


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