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

Merge branch 'spantaleev:master' into polychat-appservice

pull/3257/head
Yan Minagawa 2 лет назад
committed by GitHub
Родитель
Сommit
b19cc16e7c
Не найден GPG ключ соответствующий данной подписи Идентификатор GPG ключа: B5690EEEBB952194
5 измененных файлов: 6 добавлений и 4 удалений
  1. +1
    -1
      docs/howto-srv-server-delegation.md
  2. +1
    -1
      roles/custom/matrix-bot-draupnir/defaults/main.yml
  3. +2
    -0
      roles/custom/matrix-bridge-mautrix-whatsapp/defaults/main.yml
  4. +1
    -1
      roles/custom/matrix-bridge-mautrix-whatsapp/templates/config.yaml.j2
  5. +1
    -1
      roles/custom/matrix-media-repo/defaults/main.yml

+ 1
- 1
docs/howto-srv-server-delegation.md Просмотреть файл

@@ -27,7 +27,7 @@ Also, all instructions below are from an older version of the playbook and may n

```yaml
# To serve the federation from any domain, as long as the path matches
matrix_synapse_container_labels_public_federation_api_traefik_rule: PathPrefix(`/_matrix/federation`)
matrix_synapse_container_labels_public_federation_api_traefik_rule: PathPrefix(`/_matrix/`)
```

This is because with SRV federation, some servers / tools (one of which being the federation tester) try to access the federation API using the resolved IP address instead of the domain name (or they are not using SNI). This change will make Traefik route all traffic for which the path match this rule go to the federation endpoint.


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

@@ -5,7 +5,7 @@
matrix_bot_draupnir_enabled: true

# renovate: datasource=docker depName=gnuxie/draupnir
matrix_bot_draupnir_version: "v1.86.1"
matrix_bot_draupnir_version: "v1.86.2"

matrix_bot_draupnir_container_image_self_build: false
matrix_bot_draupnir_container_image_self_build_repo: "https://github.com/the-draupnir-project/Draupnir.git"


+ 2
- 0
roles/custom/matrix-bridge-mautrix-whatsapp/defaults/main.yml Просмотреть файл

@@ -25,6 +25,8 @@ matrix_mautrix_whatsapp_homeserver_address: ""
matrix_mautrix_whatsapp_homeserver_domain: "{{ matrix_domain }}"
matrix_mautrix_whatsapp_appservice_address: "http://matrix-mautrix-whatsapp:8080"

matrix_mautrix_whatsapp_extev_polls: false

matrix_mautrix_whatsapp_command_prefix: "!wa"

matrix_mautrix_whatsapp_container_network: ""


+ 1
- 1
roles/custom/matrix-bridge-mautrix-whatsapp/templates/config.yaml.j2 Просмотреть файл

@@ -292,7 +292,7 @@ bridge:
# Send galleries as a single event? This is not an MSC (yet).
beeper_galleries: false
# Should polls be sent using MSC3381 event types?
extev_polls: false
extev_polls: {{ matrix_mautrix_whatsapp_extev_polls | to_json }}
# Should cross-chat replies from WhatsApp be bridged? Most servers and clients don't support this.
cross_room_replies: false
# Disable generating reply fallbacks? Some extremely bad clients still rely on them,


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

@@ -19,7 +19,7 @@ matrix_media_repo_docker_image_path: "turt2live/matrix-media-repo"
matrix_media_repo_docker_image: "{{ matrix_media_repo_docker_image_name_prefix }}{{ matrix_media_repo_docker_image_path }}:{{ matrix_media_repo_docker_image_tag }}"
matrix_media_repo_docker_image_name_prefix: "{{ 'localhost/' if matrix_media_repo_container_image_self_build else matrix_container_global_registry_prefix }}"
# renovate: datasource=docker depName=turt2live/matrix-media-repo
matrix_media_repo_docker_image_tag: "v1.3.3"
matrix_media_repo_docker_image_tag: "v1.3.4"
matrix_media_repo_docker_image_force_pull: "{{ matrix_media_repo_docker_image.endswith(':latest') }}"

matrix_media_repo_base_path: "{{ matrix_base_data_path }}/{{ matrix_media_repo_identifier }}"


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