Skip to content

Commit cfca16f

Browse files
authored
Merge branch 'spantaleev:master' into master
2 parents 3fdcb17 + cb7726f commit cfca16f

File tree

22 files changed

+44
-28
lines changed

22 files changed

+44
-28
lines changed

docs/prerequisites.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ If your distro runs within an [LXC container](https://linuxcontainers.org/), you
3535
- Some TCP/UDP ports open. This playbook (actually [Docker itself](https://docs.docker.com/network/iptables/)) configures the server's internal firewall for you. In most cases, you don't need to do anything special. But **if your server is running behind another firewall**, you'd need to open these ports:
3636

3737
- `80/tcp`: HTTP webserver
38-
- `443/tcp`: HTTPS webserver
38+
- `443/tcp` and `443/udp`: HTTPS webserver
3939
- `3478/tcp`: TURN over TCP (used by Coturn)
4040
- `3478/udp`: TURN over UDP (used by Coturn)
4141
- `5349/tcp`: TURN over TCP (used by Coturn)
4242
- `5349/udp`: TURN over UDP (used by Coturn)
43-
- `8448/tcp`: Matrix Federation API HTTPS webserver. In some cases, this **may necessary even with federation disabled**. Integration Servers (like Dimension) and Identity Servers (like ma1sd) may need to access `openid` APIs on the federation port.
43+
- `8448/tcp` and `8448/udp`: Matrix Federation API HTTPS webserver. In some cases, this **may necessary even with federation disabled**. Integration Servers (like Dimension) and Identity Servers (like ma1sd) may need to access `openid` APIs on the federation port.
4444
- the range `49152-49172/udp`: TURN over UDP
4545
- potentially some other ports, depending on the additional (non-default) services that you enable in the **configuring the playbook** step (later on). Consult each service's documentation page in `docs/` for that.
4646

group_vars/matrix_servers

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2802,7 +2802,11 @@ matrix_bot_draupnir_container_network: "{{ matrix_addons_container_network }}"
28022802

28032803
matrix_bot_draupnir_container_additional_networks_auto: |-
28042804
{{
2805-
([] if matrix_addons_homeserver_container_network == '' else [matrix_addons_homeserver_container_network])
2805+
(
2806+
([] if matrix_addons_homeserver_container_network == '' else [matrix_addons_homeserver_container_network])
2807+
+
2808+
([matrix_pantalaimon_container_network] if (matrix_bot_draupnir_pantalaimon_use and matrix_pantalaimon_container_network != matrix_bot_draupnir_container_network) else [])
2809+
) | unique
28062810
}}
28072811

28082812
matrix_bot_draupnir_homeserver_url: "{{ 'http://matrix-pantalaimon:8009' if matrix_bot_draupnir_pantalaimon_use else matrix_addons_homeserver_client_api_url }}"
@@ -4851,6 +4855,9 @@ grafana_provisioning_datasources: |
48514855
'type': 'prometheus',
48524856
'access': 'proxy',
48534857
'url': ('http://' + prometheus_identifier + ':9090'),
4858+
'jsonData': {
4859+
'timeInterval': prometheus_config_global_scrape_interval,
4860+
}
48544861
}] if prometheus_enabled else [])
48554862
}}
48564863

requirements.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@
7070
version: v1.0.0-0
7171
name: timesync
7272
- src: git+https://github.com/devture/com.devture.ansible.role.traefik.git
73-
version: v3.0.4-1
73+
version: v3.1.0-0
7474
name: traefik
7575
- src: git+https://github.com/devture/com.devture.ansible.role.traefik_certs_dumper.git
76-
version: v2.8.3-2
76+
version: v2.8.3-4
7777
name: traefik_certs_dumper

roles/custom/matrix-bridge-mautrix-discord/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ matrix_mautrix_discord_container_image_self_build_repo: "https://mau.dev/mautrix
99
matrix_mautrix_discord_container_image_self_build_branch: "{{ 'main' if matrix_mautrix_discord_version == 'latest' else matrix_mautrix_discord_version }}"
1010

1111
# renovate: datasource=docker depName=dock.mau.dev/mautrix/discord
12-
matrix_mautrix_discord_version: v0.6.5
12+
matrix_mautrix_discord_version: v0.7.0
1313

1414
# See: https://mau.dev/mautrix/discord/container_registry
1515
matrix_mautrix_discord_docker_image: "{{ matrix_mautrix_discord_docker_image_name_prefix }}mautrix/discord:{{ matrix_mautrix_discord_version }}"

roles/custom/matrix-bridge-mautrix-gmessages/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ matrix_mautrix_gmessages_container_image_self_build_repo: "https://github.com/ma
99
matrix_mautrix_gmessages_container_image_self_build_branch: "{{ 'main' if matrix_mautrix_gmessages_version == 'latest' else matrix_mautrix_gmessages_version }}"
1010

1111
# renovate: datasource=docker depName=dock.mau.dev/mautrix/gmessages
12-
matrix_mautrix_gmessages_version: v0.4.2
12+
matrix_mautrix_gmessages_version: v0.4.3
1313

1414
# See: https://mau.dev/mautrix/gmessages/container_registry
1515
matrix_mautrix_gmessages_docker_image: "{{ matrix_mautrix_gmessages_docker_image_name_prefix }}mautrix/gmessages:{{ matrix_mautrix_gmessages_version }}"

roles/custom/matrix-bridge-mautrix-googlechat/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ matrix_mautrix_googlechat_container_image_self_build_repo: "https://github.com/m
99
matrix_mautrix_googlechat_container_image_self_build_repo_version: "{{ 'master' if matrix_mautrix_googlechat_version == 'latest' else matrix_mautrix_googlechat_version }}"
1010

1111
# renovate: datasource=docker depName=dock.mau.dev/mautrix/googlechat
12-
matrix_mautrix_googlechat_version: v0.5.1
12+
matrix_mautrix_googlechat_version: v0.5.2
1313
# See: https://mau.dev/mautrix/googlechat/container_registry
1414
matrix_mautrix_googlechat_docker_image: "{{ matrix_mautrix_googlechat_docker_image_name_prefix }}mautrix/googlechat:{{ matrix_mautrix_googlechat_version }}"
1515
matrix_mautrix_googlechat_docker_image_name_prefix: "{{ 'localhost/' if matrix_mautrix_googlechat_container_image_self_build else 'dock.mau.dev/' }}"

roles/custom/matrix-bridge-mautrix-meta-instagram/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ matrix_mautrix_meta_instagram_enabled: true
1313
matrix_mautrix_meta_instagram_identifier: matrix-mautrix-meta-instagram
1414

1515
# renovate: datasource=docker depName=dock.mau.dev/mautrix/meta
16-
matrix_mautrix_meta_instagram_version: v0.3.1
16+
matrix_mautrix_meta_instagram_version: v0.3.2
1717

1818
matrix_mautrix_meta_instagram_base_path: "{{ matrix_base_data_path }}/mautrix-meta-instagram"
1919
matrix_mautrix_meta_instagram_config_path: "{{ matrix_mautrix_meta_instagram_base_path }}/config"

roles/custom/matrix-bridge-mautrix-meta-messenger/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ matrix_mautrix_meta_messenger_enabled: true
1313
matrix_mautrix_meta_messenger_identifier: matrix-mautrix-meta-messenger
1414

1515
# renovate: datasource=docker depName=dock.mau.dev/mautrix/meta
16-
matrix_mautrix_meta_messenger_version: v0.3.1
16+
matrix_mautrix_meta_messenger_version: v0.3.2
1717

1818
matrix_mautrix_meta_messenger_base_path: "{{ matrix_base_data_path }}/mautrix-meta-messenger"
1919
matrix_mautrix_meta_messenger_config_path: "{{ matrix_mautrix_meta_messenger_base_path }}/config"

roles/custom/matrix-bridge-mautrix-signal/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ matrix_mautrix_signal_container_image_self_build_repo: "https://mau.dev/mautrix/
99
matrix_mautrix_signal_container_image_self_build_branch: "{{ 'main' if matrix_mautrix_signal_version == 'latest' else matrix_mautrix_signal_version }}"
1010

1111
# renovate: datasource=docker depName=dock.mau.dev/mautrix/signal
12-
matrix_mautrix_signal_version: v0.6.2
12+
matrix_mautrix_signal_version: v0.6.3
1313

1414
# See: https://mau.dev/mautrix/signal/container_registry
1515
matrix_mautrix_signal_docker_image: "{{ matrix_mautrix_signal_docker_image_name_prefix }}mautrix/signal:{{ matrix_mautrix_signal_docker_image_tag }}"

roles/custom/matrix-bridge-mautrix-telegram/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ matrix_mautrix_telegram_docker_repo_version: "{{ 'master' if matrix_mautrix_tele
2828
matrix_mautrix_telegram_docker_src_files_path: "{{ matrix_base_data_path }}/mautrix-telegram/docker-src"
2929

3030
# renovate: datasource=docker depName=dock.mau.dev/mautrix/telegram
31-
matrix_mautrix_telegram_version: v0.15.1
31+
matrix_mautrix_telegram_version: v0.15.2
3232
# See: https://mau.dev/mautrix/telegram/container_registry
3333
matrix_mautrix_telegram_docker_image: "{{ matrix_mautrix_telegram_docker_image_name_prefix }}mautrix/telegram:{{ matrix_mautrix_telegram_version }}"
3434
matrix_mautrix_telegram_docker_image_name_prefix: "{{ 'localhost/' if matrix_mautrix_telegram_container_image_self_build else 'dock.mau.dev/' }}"

roles/custom/matrix-bridge-mautrix-twitter/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ matrix_mautrix_twitter_container_image_self_build_repo: "https://github.com/maut
99
matrix_mautrix_twitter_container_image_self_build_repo_version: "{{ 'master' if matrix_mautrix_twitter_version == 'latest' else matrix_mautrix_twitter_version }}"
1010

1111
# renovate: datasource=docker depName=dock.mau.dev/mautrix/twitter
12-
matrix_mautrix_twitter_version: v0.1.7
12+
matrix_mautrix_twitter_version: v0.1.8
1313
# See: https://mau.dev/tulir/mautrix-twitter/container_registry
1414
matrix_mautrix_twitter_docker_image: "{{ matrix_mautrix_twitter_docker_image_name_prefix }}mautrix/twitter:{{ matrix_mautrix_twitter_version }}"
1515
matrix_mautrix_twitter_docker_image_name_prefix: "{{ 'localhost/' if matrix_mautrix_twitter_container_image_self_build else 'dock.mau.dev/' }}"

roles/custom/matrix-bridge-mautrix-whatsapp/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ matrix_mautrix_whatsapp_container_image_self_build_repo: "https://mau.dev/mautri
99
matrix_mautrix_whatsapp_container_image_self_build_branch: "{{ 'master' if matrix_mautrix_whatsapp_version == 'latest' else matrix_mautrix_whatsapp_version }}"
1010

1111
# renovate: datasource=docker depName=dock.mau.dev/mautrix/whatsapp
12-
matrix_mautrix_whatsapp_version: v0.10.8
12+
matrix_mautrix_whatsapp_version: v0.10.9
1313

1414
# See: https://mau.dev/mautrix/whatsapp/container_registry
1515
matrix_mautrix_whatsapp_docker_image: "{{ matrix_mautrix_whatsapp_docker_image_name_prefix }}mautrix/whatsapp:{{ matrix_mautrix_whatsapp_version }}"

roles/custom/matrix-cactus-comments-client/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ matrix_cactus_comments_client_public_path: "{{ matrix_cactus_comments_client_bas
1313
matrix_cactus_comments_client_public_path_file_permissions: "0644"
1414

1515
# renovate: datasource=docker depName=joseluisq/static-web-server
16-
matrix_cactus_comments_client_version: 2.32.0
16+
matrix_cactus_comments_client_version: 2.32.1
1717

1818
matrix_cactus_comments_client_container_image: "{{ matrix_container_global_registry_prefix }}joseluisq/static-web-server:{{ matrix_cactus_comments_client_container_image_tag }}"
1919
matrix_cactus_comments_client_container_image_tag: "{{ 'latest' if matrix_cactus_comments_client_version == 'latest' else (matrix_cactus_comments_client_version + '-alpine') }}"

roles/custom/matrix-client-element/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ matrix_client_element_container_image_self_build_repo: "https://github.com/eleme
1111
matrix_client_element_container_image_self_build_low_memory_system_patch_enabled: "{{ ansible_memtotal_mb < 4096 }}"
1212

1313
# renovate: datasource=docker depName=vectorim/element-web
14-
matrix_client_element_version: v1.11.70
14+
matrix_client_element_version: v1.11.71
1515

1616
matrix_client_element_docker_image: "{{ matrix_client_element_docker_image_name_prefix }}vectorim/element-web:{{ matrix_client_element_version }}"
1717
matrix_client_element_docker_image_name_prefix: "{{ 'localhost/' if matrix_client_element_container_image_self_build else matrix_container_global_registry_prefix }}"

roles/custom/matrix-ma1sd/defaults/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ matrix_ma1sd_container_labels_matrix_identity_traefik_tls_certResolver: "{{ matr
7878
# Controls whether labels will be added that expose ma1sd's /_matrix/client/VERSION/user_directory/search endpoint
7979
matrix_ma1sd_container_labels_matrix_client_user_directory_search_enabled: "{{ matrix_ma1sd_container_labels_traefik_enabled }}"
8080
matrix_ma1sd_container_labels_matrix_client_user_directory_search_hostname: "{{ matrix_ma1sd_hostname }}"
81-
matrix_ma1sd_container_labels_matrix_client_user_directory_search_path: "/_matrix/client/{version:(r0|v3)}/user_directory/search"
82-
matrix_ma1sd_container_labels_matrix_client_user_directory_search_traefik_rule: "Host(`{{ matrix_ma1sd_container_labels_matrix_client_user_directory_search_hostname }}`) && Path(`{{ matrix_ma1sd_container_labels_matrix_client_user_directory_search_path }}`)"
81+
matrix_ma1sd_container_labels_matrix_client_user_directory_search_path_regexp: "/_matrix/client/(?P<version>(r0|v3))/user_directory/search"
82+
matrix_ma1sd_container_labels_matrix_client_user_directory_search_traefik_rule: "Host(`{{ matrix_ma1sd_container_labels_matrix_client_user_directory_search_hostname }}`) && PathRegexp(`{{ matrix_ma1sd_container_labels_matrix_client_user_directory_search_path_regexp }}`)"
8383
matrix_ma1sd_container_labels_matrix_client_user_directory_search_traefik_priority: 0
8484
matrix_ma1sd_container_labels_matrix_client_user_directory_search_traefik_entrypoints: "{{ matrix_ma1sd_container_labels_traefik_entrypoints }}"
8585
matrix_ma1sd_container_labels_matrix_client_user_directory_search_traefik_tls: "{{ matrix_ma1sd_container_labels_matrix_client_user_directory_search_traefik_entrypoints != 'web' }}"
@@ -90,8 +90,8 @@ matrix_ma1sd_container_labels_matrix_client_user_directory_search_traefik_tls_ce
9090
# To learn more, see: https://github.com/ma1uta/ma1sd/blob/master/docs/features/registration.md
9191
matrix_ma1sd_container_labels_matrix_client_3pid_registration_enabled: false
9292
matrix_ma1sd_container_labels_matrix_client_3pid_registration_hostname: "{{ matrix_ma1sd_hostname }}"
93-
matrix_ma1sd_container_labels_matrix_client_3pid_registration_path: "/_matrix/client/{version:(r0|v3)}/register/{type:(email|msisdn)}/requestToken"
94-
matrix_ma1sd_container_labels_matrix_client_3pid_registration_traefik_rule: "Host(`{{ matrix_ma1sd_container_labels_matrix_client_3pid_registration_hostname }}`) && Path(`{{ matrix_ma1sd_container_labels_matrix_client_3pid_registration_path }}`)"
93+
matrix_ma1sd_container_labels_matrix_client_3pid_registration_path_regexp: "/_matrix/client/(?P<version>(r0|v3))/register/(?P<type>(email|msisdn))/requestToken"
94+
matrix_ma1sd_container_labels_matrix_client_3pid_registration_traefik_rule: "Host(`{{ matrix_ma1sd_container_labels_matrix_client_3pid_registration_hostname }}`) && PathRegexp(`{{ matrix_ma1sd_container_labels_matrix_client_3pid_registration_path_regexp }}`)"
9595
matrix_ma1sd_container_labels_matrix_client_3pid_registration_traefik_priority: 0
9696
matrix_ma1sd_container_labels_matrix_client_3pid_registration_traefik_entrypoints: "{{ matrix_ma1sd_container_labels_traefik_entrypoints }}"
9797
matrix_ma1sd_container_labels_matrix_client_3pid_registration_traefik_tls: "{{ matrix_ma1sd_container_labels_matrix_client_3pid_registration_traefik_entrypoints != 'web' }}"

roles/custom/matrix-ma1sd/tasks/validate_config.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,21 @@
5353
- {'name': 'matrix_ma1sd_container_labels_matrix_identity_hostname', when: "{{ matrix_ma1sd_container_labels_matrix_identity_enabled }}"}
5454
- {'name': 'matrix_ma1sd_container_labels_matrix_identity_path_prefix', when: "{{ matrix_ma1sd_container_labels_matrix_identity_enabled }}"}
5555
- {'name': 'matrix_ma1sd_container_labels_matrix_client_user_directory_search_hostname', when: "{{ matrix_ma1sd_container_labels_matrix_client_user_directory_search_enabled }}"}
56-
- {'name': 'matrix_ma1sd_container_labels_matrix_client_user_directory_search_path', when: "{{ matrix_ma1sd_container_labels_matrix_client_user_directory_search_enabled }}"}
56+
- {'name': 'matrix_ma1sd_container_labels_matrix_client_user_directory_search_path_regexp', when: "{{ matrix_ma1sd_container_labels_matrix_client_user_directory_search_enabled }}"}
57+
- {'name': 'matrix_ma1sd_container_labels_matrix_client_3pid_registration_path_regexp', when: "{{ matrix_ma1sd_container_labels_matrix_client_3pid_registration_enabled }}"}
5758

5859
- name: (Deprecation) Catch and report renamed ma1sd variables
5960
ansible.builtin.fail:
6061
msg: >-
6162
Your configuration contains a variable, which now has a different name.
6263
Please change your configuration to rename the variable (`{{ item.old }}` -> `{{ item.new }}`).
63-
when: "vars | dict2items | selectattr('key', 'match', item.old) | list | items2dict"
64+
when: "item.old in vars"
6465
with_items:
6566
- {'old': 'matrix_ma1sd_container_expose_port', 'new': '<superseded by matrix_ma1sd_container_http_host_bind_port>'}
6667
- {'old': 'matrix_ma1sd_threepid_medium_email_custom_unbind_fraudulent_template', 'new': 'matrix_ma1sd_threepid_medium_email_custom_session_unbind_notification_template'}
6768
- {'old': 'matrix_ma1sd_default_port', 'new': 'matrix_ma1sd_container_port'}
69+
- {'old': 'matrix_ma1sd_container_labels_matrix_client_user_directory_search_path', 'new': 'matrix_ma1sd_container_labels_matrix_client_user_directory_search_path_regexp'}
70+
- {'old': 'matrix_ma1sd_container_labels_matrix_client_3pid_registration_path', 'new': 'matrix_ma1sd_container_labels_matrix_client_3pid_registration_path_regexp'}
6871

6972
- name: (Deprecation) Catch and report mxisd variables
7073
ansible.builtin.fail:

roles/custom/matrix-static-files/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ matrix_static_files_enabled: true
88
matrix_static_files_identifier: matrix-static-files
99

1010
# renovate: datasource=docker depName=joseluisq/static-web-server
11-
matrix_static_files_version: 2.32.0
11+
matrix_static_files_version: 2.32.1
1212

1313
matrix_static_files_base_path: "{{ matrix_base_data_path }}/{{ 'static-files' if matrix_static_files_identifier == 'matrix-static-files' else matrix_static_files_identifier }}"
1414
matrix_static_files_config_path: "{{ matrix_static_files_base_path }}/config"

roles/custom/matrix-synapse-admin/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ matrix_synapse_admin_container_image_self_build: false
1313
matrix_synapse_admin_container_image_self_build_repo: "https://github.com/Awesome-Technologies/synapse-admin.git"
1414

1515
# renovate: datasource=docker depName=awesometechnologies/synapse-admin
16-
matrix_synapse_admin_version: 0.10.2
16+
matrix_synapse_admin_version: 0.10.3
1717
matrix_synapse_admin_docker_image: "{{ matrix_synapse_admin_docker_image_name_prefix }}awesometechnologies/synapse-admin:{{ matrix_synapse_admin_version }}"
1818
matrix_synapse_admin_docker_image_name_prefix: "{{ 'localhost/' if matrix_synapse_admin_container_image_self_build else matrix_container_global_registry_prefix }}"
1919
matrix_synapse_admin_docker_image_force_pull: "{{ matrix_synapse_admin_docker_image.endswith(':latest') }}"

roles/custom/matrix-synapse/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ matrix_synapse_enabled: true
1616
matrix_synapse_github_org_and_repo: element-hq/synapse
1717

1818
# renovate: datasource=docker depName=ghcr.io/element-hq/synapse
19-
matrix_synapse_version: v1.110.0
19+
matrix_synapse_version: v1.111.0
2020

2121
matrix_synapse_username: ''
2222
matrix_synapse_uid: ''

roles/custom/matrix-synapse/templates/synapse/worker.yaml.j2

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@ worker_log_config: /data/{{ matrix_server_fqn_matrix }}.log.config
2828
{% set http_resources = http_resources + ['client'] %}
2929
{% endif %}
3030
{% if matrix_synapse_worker_details.type == 'media_repository' %}
31-
{% set http_resources = http_resources + ['media'] %}
31+
{#
32+
Handling authenticated media endpoints (`/_matrix/client/VERSION/media/` and `/_matrix/federation/VERSION/media/`)
33+
requires serving the client and federation resources.
34+
#}
35+
{% set http_resources = http_resources + ['media', 'client', 'federation'] %}
3236
{% endif %}
3337

3438
{% set replication_http_resources = [] %}

roles/custom/matrix-synapse/vars/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,8 @@ matrix_synapse_workers_media_repository_endpoints:
243243
# Handles the media repository. It can handle all endpoints starting with:
244244

245245
- ^/_matrix/media/
246+
- ^/_matrix/client/v1/media/
247+
- ^/_matrix/federation/v1/media/
246248

247249
# ... and the following regular expressions matching media-specific administration APIs:
248250

roles/custom/matrix_playbook_migration/tasks/validate_config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,11 +271,11 @@
271271
- {'old': 'matrix_nginx_proxy_proxy_matrix_user_directory_search_enabled', 'new': '<superseded by matrix_ma1sd_container_labels_traefik_enabled and matrix_ma1sd_container_labels_matrix_client_user_directory_search_enabled>'}
272272
- {'old': 'matrix_nginx_proxy_proxy_matrix_user_directory_search_addr_with_container', 'new': '<removed>'}
273273
- {'old': 'matrix_nginx_proxy_proxy_matrix_user_directory_search_addr_sans_container', 'new': '<removed>'}
274-
- {'old': 'matrix_nginx_proxy_proxy_matrix_user_directory_search_v3_to_r0_redirect_enabled', 'new': '<superseded by matrix_ma1sd_container_labels_matrix_client_user_directory_search_path>'}
274+
- {'old': 'matrix_nginx_proxy_proxy_matrix_user_directory_search_v3_to_r0_redirect_enabled', 'new': '<superseded by matrix_ma1sd_container_labels_matrix_client_user_directory_search_path_regexp>'}
275275
- {'old': 'matrix_nginx_proxy_proxy_matrix_3pid_registration_enabled', 'new': 'matrix_ma1sd_container_labels_matrix_client_3pid_registration_enabled'}
276276
- {'old': 'matrix_nginx_proxy_proxy_matrix_3pid_registration_addr_with_container', 'new': '<removed>'}
277277
- {'old': 'matrix_nginx_proxy_proxy_matrix_3pid_registration_addr_sans_container', 'new': '<removed>'}
278-
- {'old': 'matrix_nginx_proxy_proxy_matrix_3pid_registration_v3_to_r0_redirect_enabled', 'new': '<superseded by matrix_ma1sd_container_labels_matrix_client_3pid_registration_path>'}
278+
- {'old': 'matrix_nginx_proxy_proxy_matrix_3pid_registration_v3_to_r0_redirect_enabled', 'new': '<superseded by matrix_ma1sd_container_labels_matrix_client_3pid_registration_path_regexp>'}
279279
- {'old': 'matrix_nginx_proxy_proxy_conduit_enabled', 'new': 'matrix_conduit_container_labels_traefik_enabled'}
280280
- {'old': 'matrix_nginx_proxy_proxy_conduit_block_federation_api_on_client_port', 'new': '<not supported anymore - the /_matrix/federation endpoints are now also being served on the Client-Server API port>'}
281281
- {'old': 'matrix_nginx_proxy_proxy_conduit_federation_api_enabled', 'new': 'matrix_conduit_container_labels_public_federation_api_enabled'}

0 commit comments

Comments
 (0)