Merge branch 'master' into element-call-integration

This commit is contained in:
Slavi Pantaleev
2025-03-12 18:40:31 +02:00
6 changed files with 16 additions and 6 deletions

View File

@ -1,5 +1,5 @@
<!--
SPDX-FileCopyrightText: 2024 Slavi Pantaleev
SPDX-FileCopyrightText: 2024 - 2025 MDAD Contributors
SPDX-License-Identifier: AGPL-3.0-or-later
-->

View File

@ -20,7 +20,7 @@
- {'name': 'matrix_mautrix_meta_instagram_database_hostname', when: "{{ matrix_mautrix_meta_instagram_database_engine == 'postgres' }}"}
- {'name': 'matrix_mautrix_meta_instagram_database_password', when: "{{ matrix_mautrix_meta_instagram_database_engine == 'postgres' }}"}
- name: (Deprecation) Catch and report renamed mautrix-meta-instagram settings
- name: (Deprecation) Catch and report renamed mautrix-meta-instagram variables
ansible.builtin.fail:
msg: >-
Your configuration contains a variable, which now has a different name.

View File

@ -4,7 +4,7 @@ SPDX-FileCopyrightText: 2024 Slavi Pantaleev
SPDX-License-Identifier: AGPL-3.0-or-later
#}
{% if matrix_mautrix_meta_instagram_container_labels_traefik_enabled %}
{% if matrix_mautrix_meta_instagram_container_labels_traefik_enabled and matrix_mautrix_meta_instagram_container_labels_metrics_enabled %}
traefik.enable=true
{% if matrix_mautrix_meta_instagram_container_labels_traefik_docker_network %}

View File

@ -4,7 +4,7 @@ SPDX-FileCopyrightText: 2024 Slavi Pantaleev
SPDX-License-Identifier: AGPL-3.0-or-later
#}
{% if matrix_mautrix_meta_messenger_container_labels_traefik_enabled %}
{% if matrix_mautrix_meta_messenger_container_labels_traefik_enabled and matrix_mautrix_meta_messenger_container_labels_metrics_enabled %}
traefik.enable=true
{% if matrix_mautrix_meta_messenger_container_labels_traefik_docker_network %}

View File

@ -1,3 +1,3 @@
SPDX-FileCopyrightText: 2024 Slavi Pantaleev
SPDX-FileCopyrightText: 2024 - 2025 Slavi Pantaleev
SPDX-License-Identifier: AGPL-3.0-or-later