mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2026-09-24 16:50:08 +00:00
Slavi Pantaleev
e6e19a20b4
The ownership repair added in e5b8de8c2 is not sufficient on every Ansible privilege-escalation setup. Git may still see a different effective owner after the checkout has been recursively chowned, as demonstrated by #5065.
Pass an exact, task-scoped safe.directory setting to all 56 server-side git tasks. Keep the ownership repair as well, because it remains necessary for filesystem permissions. The two controller-side theme checkouts already use the same protection.
55 lines
2.0 KiB
YAML
55 lines
2.0 KiB
YAML
# SPDX-FileCopyrightText: 2021 MDAD project contributors
|
|
# SPDX-FileCopyrightText: 2022 - 2023 Slavi Pantaleev
|
|
# SPDX-FileCopyrightText: 2022 Marko Weltzer
|
|
# SPDX-FileCopyrightText: 2022 Sebastian Gumprich
|
|
#
|
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
|
|
|
---
|
|
|
|
- name: Ensure git installed
|
|
ansible.builtin.package:
|
|
name: git
|
|
state: present
|
|
|
|
# A checkout owned by a different user (a uid change, an earlier clone by another user, etc.) would make the git task below fail on ownership or permissions.
|
|
- name: Ensure mjolnir-antispam repository ownership is correct
|
|
ansible.builtin.file:
|
|
path: "{{ matrix_synapse_ext_path }}/mjolnir"
|
|
state: directory
|
|
owner: "{{ matrix_synapse_uid }}"
|
|
group: "{{ matrix_synapse_gid }}"
|
|
recurse: true
|
|
|
|
- name: Clone mjolnir-antispam git repository
|
|
ansible.builtin.git:
|
|
repo: "{{ matrix_synapse_ext_spam_checker_mjolnir_antispam_git_repository_url }}"
|
|
version: "{{ matrix_synapse_ext_spam_checker_mjolnir_antispam_git_version }}"
|
|
dest: "{{ matrix_synapse_ext_path }}/mjolnir"
|
|
force: "yes"
|
|
become: true
|
|
become_user: "{{ matrix_synapse_username }}"
|
|
# Keep this even though the task above normalizes ownership. Git may still see an ownership mismatch when Ansible becomes an unprivileged user (see #5065).
|
|
environment:
|
|
GIT_CONFIG_COUNT: "1"
|
|
GIT_CONFIG_KEY_0: safe.directory
|
|
GIT_CONFIG_VALUE_0: "{{ matrix_synapse_ext_path }}/mjolnir"
|
|
|
|
- ansible.builtin.set_fact:
|
|
matrix_synapse_modules: >
|
|
{{
|
|
matrix_synapse_modules | default([])
|
|
+
|
|
[{
|
|
"module": "mjolnir.Module",
|
|
"config": matrix_synapse_ext_spam_checker_mjolnir_antispam_config,
|
|
}]
|
|
}}
|
|
|
|
matrix_synapse_container_extra_arguments: >
|
|
{{
|
|
matrix_synapse_container_extra_arguments | default([])
|
|
+
|
|
["--mount type=bind,src=" + matrix_synapse_ext_path + "/mjolnir/synapse_antispam/mjolnir,dst=" + matrix_synapse_in_container_python_packages_path + "/mjolnir,ro"]
|
|
}}
|