mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2025-01-15 12:43:12 +01:00
removed duplicate tasks.
This commit is contained in:
parent
8cb3e33bbf
commit
e952ba1c3a
@ -11,24 +11,13 @@
|
|||||||
group: "{{ matrix_user_groupname }}"
|
group: "{{ matrix_user_groupname }}"
|
||||||
with_items:
|
with_items:
|
||||||
- path: "{{ matrix_element_call_base_path }}"
|
- path: "{{ matrix_element_call_base_path }}"
|
||||||
- path: "{{ matrix_element_call_base_path }}/data"
|
|
||||||
- path: "{{ matrix_element_call_base_path }}/config"
|
|
||||||
- path: "{{ matrix_element_call_base_path }}/backend" # For LiveKit and Redis config
|
|
||||||
- path: "{{ matrix_base_data_path }}/static-files/public/.well-known/element" # Directory for element.json
|
- path: "{{ matrix_base_data_path }}/static-files/public/.well-known/element" # Directory for element.json
|
||||||
|
|
||||||
# Ensure Configuration Files are in Place
|
# Ensure Configuration Files are in Place
|
||||||
- name: Ensure Element Call config.json is in place
|
- name: Ensure Element Call config.json is in place
|
||||||
ansible.builtin.template:
|
ansible.builtin.template:
|
||||||
src: "{{ role_path }}/templates/config.json.j2"
|
src: "{{ role_path }}/templates/config.json.j2"
|
||||||
dest: "{{ matrix_element_call_base_path }}/config/config.json"
|
dest: "{{ matrix_element_call_base_path }}/config.json"
|
||||||
mode: 0640
|
|
||||||
owner: "{{ matrix_user_username }}"
|
|
||||||
group: "{{ matrix_user_groupname }}"
|
|
||||||
|
|
||||||
- name: Ensure LiveKit livekit.yaml is in place
|
|
||||||
ansible.builtin.template:
|
|
||||||
src: "{{ role_path }}/templates/livekit.yaml.j2"
|
|
||||||
dest: "{{ matrix_element_call_base_path }}/backend/livekit.yaml"
|
|
||||||
mode: 0640
|
mode: 0640
|
||||||
owner: "{{ matrix_user_username }}"
|
owner: "{{ matrix_user_username }}"
|
||||||
group: "{{ matrix_user_groupname }}"
|
group: "{{ matrix_user_groupname }}"
|
||||||
@ -41,34 +30,10 @@
|
|||||||
owner: "{{ matrix_user_username }}"
|
owner: "{{ matrix_user_username }}"
|
||||||
group: "{{ matrix_user_groupname }}"
|
group: "{{ matrix_user_groupname }}"
|
||||||
|
|
||||||
- name: Ensure matrix-element-call environment file is in place
|
|
||||||
ansible.builtin.template:
|
|
||||||
src: "{{ role_path }}/templates/env.j2"
|
|
||||||
dest: "{{ matrix_element_call_base_path }}/config/env"
|
|
||||||
mode: 0640
|
|
||||||
owner: "{{ matrix_user_username }}"
|
|
||||||
group: "{{ matrix_user_groupname }}"
|
|
||||||
|
|
||||||
- name: Ensure matrix-element-call Docker labels file is in place
|
- name: Ensure matrix-element-call Docker labels file is in place
|
||||||
ansible.builtin.template:
|
ansible.builtin.template:
|
||||||
src: "{{ role_path }}/templates/element-call-labels.j2"
|
src: "{{ role_path }}/templates/element-call-labels.j2"
|
||||||
dest: "{{ matrix_element_call_base_path }}/config/element-call-labels"
|
dest: "{{ matrix_element_call_base_path }}/element-call-labels"
|
||||||
mode: 0640
|
|
||||||
owner: "{{ matrix_user_username }}"
|
|
||||||
group: "{{ matrix_user_groupname }}"
|
|
||||||
|
|
||||||
- name: Ensure LiveKit labels file is in place
|
|
||||||
ansible.builtin.template:
|
|
||||||
src: "{{ role_path }}/templates/livekit-labels.j2"
|
|
||||||
dest: "{{ matrix_element_call_base_path }}/config/livekit-labels"
|
|
||||||
mode: 0640
|
|
||||||
owner: "{{ matrix_user_username }}"
|
|
||||||
group: "{{ matrix_user_groupname }}"
|
|
||||||
|
|
||||||
- name: Ensure JWT Service labels file is in place
|
|
||||||
ansible.builtin.template:
|
|
||||||
src: "{{ role_path }}/templates/jwt-service-labels.j2"
|
|
||||||
dest: "{{ matrix_element_call_base_path }}/config/jwt-service-labels"
|
|
||||||
mode: 0640
|
mode: 0640
|
||||||
owner: "{{ matrix_user_username }}"
|
owner: "{{ matrix_user_username }}"
|
||||||
group: "{{ matrix_user_groupname }}"
|
group: "{{ matrix_user_groupname }}"
|
||||||
@ -84,24 +49,6 @@
|
|||||||
delay: "{{ devture_playbook_help_container_retries_delay }}"
|
delay: "{{ devture_playbook_help_container_retries_delay }}"
|
||||||
until: element_call_image_result is not failed
|
until: element_call_image_result is not failed
|
||||||
|
|
||||||
- name: Ensure jwt-service Docker image is pulled
|
|
||||||
community.docker.docker_image:
|
|
||||||
name: "{{ matrix_jwt_service_image }}"
|
|
||||||
source: pull
|
|
||||||
register: jwt_image_result
|
|
||||||
retries: 3
|
|
||||||
delay: 10
|
|
||||||
until: jwt_image_result is not failed
|
|
||||||
|
|
||||||
- name: Ensure livekit Docker image is pulled
|
|
||||||
community.docker.docker_image:
|
|
||||||
name: "{{ matrix_livekit_image }}"
|
|
||||||
source: pull
|
|
||||||
register: livekit_image_result
|
|
||||||
retries: 3
|
|
||||||
delay: 10
|
|
||||||
until: livekit_image_result is not failed
|
|
||||||
|
|
||||||
- name: Ensure redis Docker image is pulled
|
- name: Ensure redis Docker image is pulled
|
||||||
community.docker.docker_image:
|
community.docker.docker_image:
|
||||||
name: "{{ redis_image }}"
|
name: "{{ redis_image }}"
|
||||||
@ -119,18 +66,6 @@
|
|||||||
dest: "{{ devture_systemd_docker_base_systemd_path }}/matrix-element-call.service"
|
dest: "{{ devture_systemd_docker_base_systemd_path }}/matrix-element-call.service"
|
||||||
mode: 0644
|
mode: 0644
|
||||||
|
|
||||||
- name: Ensure jwt-service systemd service is installed
|
|
||||||
ansible.builtin.template:
|
|
||||||
src: "{{ role_path }}/templates/systemd/matrix-jwt-service.service.j2"
|
|
||||||
dest: "{{ devture_systemd_docker_base_systemd_path }}/matrix-jwt-service.service"
|
|
||||||
mode: 0644
|
|
||||||
|
|
||||||
- name: Ensure livekit systemd service is installed
|
|
||||||
ansible.builtin.template:
|
|
||||||
src: "{{ role_path }}/templates/systemd/matrix-livekit.service.j2"
|
|
||||||
dest: "{{ devture_systemd_docker_base_systemd_path }}/matrix-livekit.service"
|
|
||||||
mode: 0644
|
|
||||||
|
|
||||||
- name: Ensure redis systemd service is installed
|
- name: Ensure redis systemd service is installed
|
||||||
ansible.builtin.template:
|
ansible.builtin.template:
|
||||||
src: "{{ role_path }}/templates/systemd/matrix-redis.service.j2"
|
src: "{{ role_path }}/templates/systemd/matrix-redis.service.j2"
|
||||||
|
@ -6,16 +6,6 @@
|
|||||||
name: "matrix-element-call"
|
name: "matrix-element-call"
|
||||||
state: absent
|
state: absent
|
||||||
|
|
||||||
- name: Stop and remove jwt-service container
|
|
||||||
community.docker.docker_container:
|
|
||||||
name: "matrix-jwt-service"
|
|
||||||
state: absent
|
|
||||||
|
|
||||||
- name: Stop and remove livekit container
|
|
||||||
community.docker.docker_container:
|
|
||||||
name: "matrix-livekit"
|
|
||||||
state: absent
|
|
||||||
|
|
||||||
- name: Stop and remove redis container
|
- name: Stop and remove redis container
|
||||||
community.docker.docker_container:
|
community.docker.docker_container:
|
||||||
name: "matrix-redis"
|
name: "matrix-redis"
|
||||||
@ -26,16 +16,6 @@
|
|||||||
path: "{{ devture_systemd_docker_base_systemd_path }}/matrix-element-call.service"
|
path: "{{ devture_systemd_docker_base_systemd_path }}/matrix-element-call.service"
|
||||||
state: absent
|
state: absent
|
||||||
|
|
||||||
- name: Remove jwt-service systemd service
|
|
||||||
ansible.builtin.file:
|
|
||||||
path: "{{ devture_systemd_docker_base_systemd_path }}/matrix-jwt-service.service"
|
|
||||||
state: absent
|
|
||||||
|
|
||||||
- name: Remove livekit systemd service
|
|
||||||
ansible.builtin.file:
|
|
||||||
path: "{{ devture_systemd_docker_base_systemd_path }}/matrix-livekit.service"
|
|
||||||
state: absent
|
|
||||||
|
|
||||||
- name: Remove redis systemd service
|
- name: Remove redis systemd service
|
||||||
ansible.builtin.file:
|
ansible.builtin.file:
|
||||||
path: "{{ devture_systemd_docker_base_systemd_path }}/matrix-redis.service"
|
path: "{{ devture_systemd_docker_base_systemd_path }}/matrix-redis.service"
|
||||||
|
@ -10,8 +10,4 @@
|
|||||||
- {'name': 'matrix_element_call_base_path', when: true}
|
- {'name': 'matrix_element_call_base_path', when: true}
|
||||||
- {'name': 'matrix_element_call_container_network', when: true}
|
- {'name': 'matrix_element_call_container_network', when: true}
|
||||||
- {'name': 'matrix_element_call_image', when: true}
|
- {'name': 'matrix_element_call_image', when: true}
|
||||||
- {'name': 'matrix_jwt_service_image', when: true}
|
|
||||||
- {'name': 'matrix_livekit_image', when: true}
|
|
||||||
- {'name': 'redis_image', when: true}
|
- {'name': 'redis_image', when: true}
|
||||||
- {'name': 'matrix_element_call_livekit_dev_key', when: true}
|
|
||||||
- {'name': 'matrix_jwt_service_url', when: true}
|
|
||||||
|
@ -23,7 +23,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
|
|||||||
{% if matrix_element_call_container_http_host_bind_port %}
|
{% if matrix_element_call_container_http_host_bind_port %}
|
||||||
-p {{ matrix_element_call_container_http_host_bind_port }}:8080 \
|
-p {{ matrix_element_call_container_http_host_bind_port }}:8080 \
|
||||||
{% endif %}
|
{% endif %}
|
||||||
--label-file={{ matrix_element_call_base_path }}/config/element-call-labels \
|
--label-file={{ matrix_element_call_base_path }}/element-call-labels \
|
||||||
{% for arg in matrix_element_call_container_extra_arguments %}
|
{% for arg in matrix_element_call_container_extra_arguments %}
|
||||||
{{ arg }} \
|
{{ arg }} \
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user