mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2024-12-26 10:58:30 +01:00
2473cd655b
This fixes a regression since the change done in c1c152f7ac.
When another role (say `matrix-jitsi`) included `roles/custom/matrix-base/tasks/util/ensure_openssl_installed.yml`,
which then included `{{ role_path }}/tasks/util/ensure_openssl_installed_DISTRO.yml`,
that `role_path` variable would end up being the parent role
(`matrix-jitsi`) and not the `matrix-base` role, so we'd get a failure.
An alternative solution may have been to avoid using `role_path`, but
importing roles properly (like we've done in this patch) sounds like a better way.
Unfortunately, `import_role` fails if `tasks_from` is something like
`util/ensure_openssl_installed` (containing a `/`), so I had to move
these utils out of `util/`.
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2228
52 lines
2.1 KiB
YAML
52 lines
2.1 KiB
YAML
---
|
|
|
|
- ansible.builtin.import_role:
|
|
name: custom/matrix-base
|
|
tasks_from: ensure_fuse_installed
|
|
|
|
- name: Ensure Goofys Docker image is pulled
|
|
community.docker.docker_image:
|
|
name: "{{ matrix_s3_goofys_docker_image }}"
|
|
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
|
|
force_source: "{{ matrix_s3_goofys_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
|
|
force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_s3_goofys_docker_image_force_pull }}"
|
|
register: result
|
|
retries: "{{ devture_playbook_help_container_retries_count }}"
|
|
delay: "{{ devture_playbook_help_container_retries_delay }}"
|
|
until: result is not failed
|
|
|
|
# This will throw a Permission Denied error if already mounted
|
|
- name: Check Matrix Goofys external storage mountpoint path
|
|
ansible.builtin.stat:
|
|
path: "{{ matrix_s3_media_store_path }}"
|
|
register: local_path_matrix_s3_media_store_path_stat
|
|
ignore_errors: true
|
|
|
|
- name: Ensure Matrix Goofys external storage mountpoint exists
|
|
ansible.builtin.file:
|
|
path: "{{ matrix_s3_media_store_path }}"
|
|
state: directory
|
|
mode: 0750
|
|
owner: "{{ matrix_user_username }}"
|
|
group: "{{ matrix_user_groupname }}"
|
|
when: "not local_path_matrix_s3_media_store_path_stat.failed and not local_path_matrix_s3_media_store_path_stat.stat.exists"
|
|
|
|
- name: Ensure goofys environment variables file created
|
|
ansible.builtin.template:
|
|
src: "{{ role_path }}/templates/goofys/env-goofys.j2"
|
|
dest: "{{ matrix_synapse_config_dir_path }}/env-goofys"
|
|
owner: root
|
|
mode: 0600
|
|
|
|
- name: Ensure matrix-goofys.service installed
|
|
ansible.builtin.template:
|
|
src: "{{ role_path }}/templates/goofys/systemd/matrix-goofys.service.j2"
|
|
dest: "{{ devture_systemd_docker_base_systemd_path }}/matrix-goofys.service"
|
|
mode: 0644
|
|
register: matrix_goofys_systemd_service_result
|
|
|
|
- name: Ensure systemd reloaded after matrix-goofys.service installation
|
|
ansible.builtin.service:
|
|
daemon_reload: true
|
|
when: "matrix_goofys_systemd_service_result.changed"
|