finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove jibri

Browse Source
This commit is contained in:
sak
2021-07-01 15:37:20 +05:30
parent 8a369f61f3
commit 7b2211da8e
7 changed files with 72 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
roles/matrix-jitsi/defaults/main.yml
View File

@ -259,16 +259,3 @@ matrix_jitsi_jvb_container_rtp_tcp_host_bind_port: "{{ matrix_jitsi_jvb_rtp_tcp_
#
# Takes an "<ip>:<port>" or "<port>" value (e.g. "127.0.0.1:12090"), or empty string to not expose.
matrix_jitsi_jvb_container_colibri_ws_host_bind_port: ''
# Jibri
matrix_jitsi_jibri_docker_image: "{{ matrix_container_global_registry_prefix }}jitsi/jibri:{{ matrix_jitsi_container_image_tag }}"
matrix_jitsi_jibri_docker_image_force_pull: "{{ matrix_jitsi_jibri_docker_image.endswith(':latest') }}"
matrix_jitsi_jibri_base_path: "{{ matrix_base_data_path }}/jitsi/jibri"
matrix_jitsi_jibri_config_path: "{{ matrix_jitsi_jibri_base_path }}/config"
# A list of extra arguments to pass to the container
matrix_jitsi_jibri_container_extra_arguments: []
# List of systemd services that matrix-jitsi-jicofo.service depends on
matrix_jitsi_jibri_systemd_required_services_list: ['docker.service', 'matrix-jitsi-jicofo.service']

2
roles/matrix-jitsi/tasks/init.yml
View File

@ -1,3 +1,3 @@
- set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-jitsi-web.service', 'matrix-jitsi-prosody.service', 'matrix-jitsi-jicofo.service', 'matrix-jitsi-jvb.service', 'matrix-jitsi-jibri.service'] }}"
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-jitsi-web.service', 'matrix-jitsi-prosody.service', 'matrix-jitsi-jicofo.service', 'matrix-jitsi-jvb.service'] }}"
when: matrix_jitsi_enabled|bool

6
roles/matrix-jitsi/tasks/main.yml
View File

@ -37,9 +37,3 @@
tags:
- setup-all
- setup-jitsi
- import_tasks: "{{ role_path }}/tasks/setup_jitsi_jibri.yml"
when: run_setup|bool
tags:
- setup-all
- setup-jitsi

83
roles/matrix-jitsi/tasks/setup_jitsi_jibri.yml
View File

@ -1,83 +0,0 @@
---
#
# Tasks related to setting up jitsi-jibri
#
- name: Ensure Matrix jitsi-jibri path exists
file:
path: "{{ item.path }}"
state: directory
mode: 0777
owner: "{{ matrix_user_username }}"
group: "{{ matrix_user_groupname }}"
with_items:
- { path: "{{ matrix_jitsi_jibri_base_path }}", when: true }
- { path: "{{ matrix_jitsi_jibri_config_path }}", when: true }
when: matrix_jitsi_enabled|bool and item.when
- name: Ensure jitsi-jibri Docker image is pulled
docker_image:
name: "{{ matrix_jitsi_jibri_docker_image }}"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
force_source: "{{ matrix_jitsi_jibri_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_jitsi_jibri_docker_image_force_pull }}"
when: matrix_jitsi_enabled|bool
- name: Ensure jitsi-jibri environment variables file created
template:
src: "{{ role_path }}/templates/jibri/env.j2"
dest: "{{ matrix_jitsi_jibri_base_path }}/env"
mode: 0640
when: matrix_jitsi_enabled|bool
- name: Ensure matrix-jitsi-jibri.service installed
template:
src: "{{ role_path }}/templates/jibri/matrix-jitsi-jibri.service.j2"
dest: "{{ matrix_systemd_path }}/matrix-jitsi-jibri.service"
mode: 0644
register: matrix_jitsi_jibri_systemd_service_result
when: matrix_jitsi_enabled|bool
- name: Ensure systemd reloaded after matrix-jitsi-jibri.service installation
service:
daemon_reload: yes
when: "matrix_jitsi_enabled and matrix_jitsi_jibri_systemd_service_result.changed"
#
# Tasks related to getting rid of jitsi-jibri (if it was previously enabled)
#
- name: Check existence of matrix-jitsi-jibri service
stat:
path: "{{ matrix_systemd_path }}/matrix-jitsi-jibri.service"
register: matrix_jitsi_jibri_service_stat
when: "not matrix_jitsi_enabled|bool"
- name: Ensure matrix-jitsi-jibri is stopped
service:
name: matrix-jitsi-jibri
state: stopped
daemon_reload: yes
register: stopping_result
when: "not matrix_jitsi_enabled|bool and matrix_jitsi_jibri_service_stat.stat.exists"
- name: Ensure matrix-jitsi-jibri.service doesn't exist
file:
path: "{{ matrix_systemd_path }}/matrix-jitsi-jibri.service"
state: absent
when: "not matrix_jitsi_enabled|bool and matrix_jitsi_jibri_service_stat.stat.exists"
- name: Ensure systemd reloaded after matrix-jitsi-jibri.service removal
service:
daemon_reload: yes
when: "not matrix_jitsi_enabled|bool and matrix_jitsi_jibri_service_stat.stat.exists"
- name: Ensure Matrix jitsi-jibri paths doesn't exist
file:
path: "{{ matrix_jitsi_jibri_base_path }}"
state: absent
when: "not matrix_jitsi_enabled|bool"
# Intentionally not removing the Docker image when uninstalling.
# We can't be sure it had been pulled by us in the first place.

17
roles/matrix-jitsi/templates/jibri/env.j2
View File

@ -1,17 +0,0 @@
PUBLIC_URL={{ matrix_jitsi_web_public_url }}
XMPP_AUTH_DOMAIN={{ matrix_jitsi_xmpp_auth_domain }}
XMPP_INTERNAL_MUC_DOMAIN={{ matrix_jitsi_xmpp_internal_muc_domain }}
XMPP_RECORDER_DOMAIN={{ matrix_jitsi_recorder_domain }}
XMPP_SERVER={{ matrix_jitsi_xmpp_server }}
XMPP_DOMAIN={{ matrix_jitsi_xmpp_domain }}
JIBRI_XMPP_USER={{ matrix_jitsi_jibri_xmpp_user }}
JIBRI_XMPP_PASSWORD={{ matrix_jitsi_jibri_xmpp_password }}
JIBRI_BREWERY_MUC={{ matrix_jitsi_jibri_brewery_muc }}
JIBRI_RECORDER_USER={{ matrix_jitsi_jibri_recorder_user }}
JIBRI_RECORDER_PASSWORD={{ matrix_jitsi_jibri_recorder_password }}
JIBRI_RECORDING_DIR=/config/recordings
JIBRI_FINALIZE_RECORDING_SCRIPT_PATH
JIBRI_STRIP_DOMAIN_JID=muc
JIBRI_LOGS_DIR=/config/logs
DISPLAY=:0
TZ={{ matrix_jitsi_timezone }}

39
roles/matrix-jitsi/templates/jibri/matrix-jitsi-jibri.service.j2
View File

@ -1,39 +0,0 @@
#jinja2: lstrip_blocks: "True"
[Unit]
Description=Matrix jitsi-jibri server
{% for service in matrix_jitsi_jibri_systemd_required_services_list %}
Requires={{ service }}
After={{ service }}
{% endfor %}
DefaultDependencies=no
[Service]
Type=simple
Environment="HOME={{ matrix_systemd_unit_home_path }}"
ExecStartPre=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-jitsi-jibri 2>/dev/null'
ExecStartPre=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-jitsi-jibri 2>/dev/null'
ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-jitsi-jibri \
--log-driver=none \
--network={{ matrix_docker_network }} \
--env-file={{ matrix_jitsi_jibri_base_path }}/env \
# --device=/dev/snd:/dev/snd \
--mount type=bind,src=/dev/snd,dst=/dev/snd \
--mount type=bind,src={{ matrix_jitsi_jibri_config_path }},dst=/config \
# --volume={{ matrix_jitsi_jibri_config_path }}:/config:Z \
--volume=/dev/shm:/dev/shm \
--cap-add=SYS_ADMIN \
--cap-add=NET_BIND_SERVICE \
{% for arg in matrix_jitsi_jibri_container_extra_arguments %}
{{ arg }} \
{% endfor %}
{{ matrix_jitsi_jibri_docker_image }}
ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-jitsi-jibri 2>/dev/null'
ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-jitsi-jibri 2>/dev/null'
Restart=always
RestartSec=30
SyslogIdentifier=matrix-jitsi-jibri
[Install]
WantedBy=multi-user.target