mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2025-03-20 11:29:54 +01:00
Merge branch 'master' into element-call-integration
This commit is contained in:
commit
d9df022d55
@ -37,7 +37,17 @@ done
|
|||||||
sed --in-place 's/matrix_mautrix_meta_instagram_meta_mode: \(.*\)/matrix_mautrix_meta_instagram_meta_mode: instagram/g' $instagram_role_path/defaults/main.yml
|
sed --in-place 's/matrix_mautrix_meta_instagram_meta_mode: \(.*\)/matrix_mautrix_meta_instagram_meta_mode: instagram/g' $instagram_role_path/defaults/main.yml
|
||||||
sed --in-place 's/matrix_mautrix_meta_instagram_identifier: \(.*\)/matrix_mautrix_meta_instagram_identifier: matrix-mautrix-meta-instagram/g' $instagram_role_path/defaults/main.yml
|
sed --in-place 's/matrix_mautrix_meta_instagram_identifier: \(.*\)/matrix_mautrix_meta_instagram_identifier: matrix-mautrix-meta-instagram/g' $instagram_role_path/defaults/main.yml
|
||||||
|
|
||||||
echo "# matrix-mautrix-meta-instagram" > $instagram_role_path/README.md
|
# Create the README.md file with the license header
|
||||||
|
cat > $instagram_role_path/README.md << 'EOF'
|
||||||
|
<!--
|
||||||
|
SPDX-FileCopyrightText: 2024 - 2025 MDAD Contributors
|
||||||
|
|
||||||
|
SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
|
-->
|
||||||
|
EOF
|
||||||
|
|
||||||
|
echo "" >> $instagram_role_path/README.md
|
||||||
|
echo "# matrix-mautrix-meta-instagram" >> $instagram_role_path/README.md
|
||||||
echo "" >> $instagram_role_path/README.md
|
echo "" >> $instagram_role_path/README.md
|
||||||
echo "This bridge role is derived from the matrix-mautrix-meta-messenger Ansible role via automatic changes (see \`just rebuild-mautrix-meta-instagram\` or \`bin/rebuild-mautrix-meta-instagram.sh\`)." >> $instagram_role_path/README.md
|
echo "This bridge role is derived from the matrix-mautrix-meta-messenger Ansible role via automatic changes (see \`just rebuild-mautrix-meta-instagram\` or \`bin/rebuild-mautrix-meta-instagram.sh\`)." >> $instagram_role_path/README.md
|
||||||
echo "" >> $instagram_role_path/README.md
|
echo "" >> $instagram_role_path/README.md
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<!--
|
<!--
|
||||||
SPDX-FileCopyrightText: 2024 Slavi Pantaleev
|
SPDX-FileCopyrightText: 2024 - 2025 MDAD Contributors
|
||||||
|
|
||||||
SPDX-License-Identifier: AGPL-3.0-or-later
|
SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
-->
|
-->
|
||||||
|
@ -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_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': '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:
|
ansible.builtin.fail:
|
||||||
msg: >-
|
msg: >-
|
||||||
Your configuration contains a variable, which now has a different name.
|
Your configuration contains a variable, which now has a different name.
|
||||||
|
@ -4,7 +4,7 @@ SPDX-FileCopyrightText: 2024 Slavi Pantaleev
|
|||||||
SPDX-License-Identifier: AGPL-3.0-or-later
|
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
|
traefik.enable=true
|
||||||
|
|
||||||
{% if matrix_mautrix_meta_instagram_container_labels_traefik_docker_network %}
|
{% if matrix_mautrix_meta_instagram_container_labels_traefik_docker_network %}
|
||||||
|
@ -4,7 +4,7 @@ SPDX-FileCopyrightText: 2024 Slavi Pantaleev
|
|||||||
SPDX-License-Identifier: AGPL-3.0-or-later
|
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
|
traefik.enable=true
|
||||||
|
|
||||||
{% if matrix_mautrix_meta_messenger_container_labels_traefik_docker_network %}
|
{% if matrix_mautrix_meta_messenger_container_labels_traefik_docker_network %}
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
SPDX-FileCopyrightText: 2024 Slavi Pantaleev
|
SPDX-FileCopyrightText: 2024 - 2025 Slavi Pantaleev
|
||||||
|
|
||||||
SPDX-License-Identifier: AGPL-3.0-or-later
|
SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
|
Loading…
x
Reference in New Issue
Block a user