pub-solar/matrix-docker-ansible-deploy
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Changed volume mounting and directory structure

Browse source
This commit is contained in:
Michael Hollister 2023-07-13 15:02:21 -05:00
parent b9f5aa0344
commit ecb24dcaab
4 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/custom/matrix-media-repo/defaults/main.yml
View file

@ -17,6 +17,8 @@ matrix_media_repo_docker_image_tag: "v1.2.13"
matrix_media_repo_docker_image_force_pull: "{{ matrix_media_repo_docker_image.endswith(':latest') }}"
matrix_media_repo_base_path: "{{ matrix_base_data_path }}/media-repo"
matrix_media_repo_config_path: "{{ matrix_media_repo_base_path }}/config"
matrix_media_repo_data_path: "{{ matrix_media_repo_base_path }}/data"
matrix_media_repo_docker_src_files_path: "{{ matrix_media_repo_base_path }}/docker-src"
# List of systemd services that matrix-conduit.service depends on

16
roles/custom/matrix-media-repo/tasks/setup_install.yml
View file

@ -10,14 +10,28 @@
with_items:
- path: "{{ matrix_media_repo_base_path }}"
when: true
- path: "{{ matrix_media_repo_config_path }}"
when: true
- path: "{{ matrix_media_repo_data_path }}"
when: true
- path: "{{ matrix_media_repo_docker_src_files_path }}"
when: "{{ matrix_media_repo_container_image_self_build }}"
when: "item.when | bool"
- name: Ensure media-repo support files installed
ansible.builtin.template:
src: "{{ role_path }}/templates/media-repo/{{ item }}.j2"
dest: "{{ matrix_media_repo_base_path }}/{{ item }}"
mode: 0640
owner: "{{ matrix_user_username }}"
group: "{{ matrix_user_groupname }}"
with_items:
- env
- name: Ensure media-repo configuration installed
ansible.builtin.template:
src: "{{ role_path }}/templates/media-repo/media-repo.yaml.j2"
dest: "{{ matrix_media_repo_base_path }}/media-repo.yaml"
dest: "{{ matrix_media_repo_config_path }}/media-repo.yaml"
mode: 0640
owner: "{{ matrix_user_username }}"
group: "{{ matrix_user_groupname }}"

1
roles/custom/matrix-media-repo/templates/media-repo/env.j2 Normal file
View file

@ -0,0 +1 @@
REPO_CONFIG=/config/media-repo.yaml

4
roles/custom/matrix-media-repo/templates/media-repo/systemd/matrix-media-repo.service.j2
View file

@ -23,13 +23,15 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
--cap-drop=ALL \
--network={{ matrix_docker_network }} \
--env-file={{ matrix_media_repo_base_path }}/env \
{% if matrix_media_repo_container_http_host_bind_port %}
-p {{ matrix_media_repo_container_http_host_bind_port }}:{{ matrix_media_repo_port }} \
{% endif %}
{% if matrix_media_repo_metrics_enabled and matrix_media_repo_container_metrics_host_bind_port %}
-p {{ matrix_media_repo_container_metrics_host_bind_port }}:{{ matrix_media_repo_metrics_port }} \
{% endif %}
-v {{ matrix_media_repo_base_path }}:/data:z \
--mount type=bind,src={{ matrix_media_repo_config_path }},dst=/config,ro \
--mount type=bind,src={{ matrix_media_repo_data_path }},dst=/data \
--workdir='/data' \
--entrypoint='media_repo' \
{% for arg in matrix_media_repo_container_extra_arguments %}