removed trailing whitespaces

This commit is contained in:
wjbeckett 2024-10-03 12:38:34 +10:00
parent 1e6698cb99
commit a03f5985a5
25 changed files with 28 additions and 29 deletions

View File

@ -38,7 +38,7 @@ ansible-playbook -i inventory setup.yml
```
## Usage
Once installed, and in conjunction with Element Call and JWT Service, Livekit will become the WebRTC backend for all Element client calls.
Once installed, and in conjunction with Element Call and JWT Service, Livekit will become the WebRTC backend for all Element client calls.
## Required Firewall and Port Forwarding Rules

View File

@ -5901,7 +5901,6 @@ matrix_element_call_container_labels_traefik_docker_network: "{{ matrix_playbook
matrix_element_call_container_labels_traefik_entrypoints: "{{ devture_traefik_entrypoint_primary }}"
matrix_element_call_container_labels_traefik_tls_certResolver: "{{ devture_traefik_certResolver_primary }}"
########################################################################
# #
# /matrix-element-call #
@ -5919,7 +5918,7 @@ matrix_livekit_server_enabled: false # Default is false; should be enabled in h
matrix_livekit_server_version: "latest" # Default version; can be overridden in host_vars
matrix_livekit_server_scheme: "https"
matrix_livekit_server_hostname: "sfu.{{ matrix_domain }}" # Default hostname; should be overridden in host_vars if different
matrix_livekit_server_path_prefix: "/"
matrix_livekit_server_path_prefix: "/"
matrix_livekit_server_base_path: "{{ matrix_base_data_path }}/livekit-server"
matrix_livekit_server_container_image: "livekit/livekit-server:{{ matrix_livekit_server_version }}"
matrix_livekit_server_container_image_force_pull: true

View File

@ -122,4 +122,4 @@ matrix_element_call_hsts_preload_enabled: false
# Enable or disable metrics collection
matrix_element_call_metrics_enabled: false
matrix_element_call_metrics_port: 2112
matrix_element_call_metrics_port: 2112

View File

@ -96,6 +96,4 @@
# Update Element Web config.json with Element Call settings
- name: Update Element Web config.json
ansible.builtin.include_tasks: "tasks/update_element_web_config.yml"
when: matrix_element_call_enabled | bool
when: matrix_element_call_enabled | bool

View File

@ -18,4 +18,4 @@
- setup-element-call
block:
- when: not matrix_element_call_enabled | bool
ansible.builtin.include_tasks: "{{ role_path }}/tasks/uninstall.yml"
ansible.builtin.include_tasks: "{{ role_path }}/tasks/uninstall.yml"

View File

@ -18,4 +18,4 @@
- name: Reload systemd daemon
ansible.builtin.systemd:
daemon_reload: true
daemon_reload: true

View File

@ -1,8 +1,9 @@
---
- name: Load Element Web config.json content
ansible.builtin.slurp:
src: "{{ element_web_config_path }}"
register: element_web_config_content_raw
ignore_errors: no
ignore_errors: false
- name: Parse Element Web config.json content
ansible.builtin.set_fact:
@ -35,4 +36,4 @@
mode: '0644'
owner: "{{ matrix_user_username }}"
group: "{{ matrix_user_groupname }}"
when: element_web_config_content is defined
when: element_web_config_content is defined

View File

@ -18,4 +18,4 @@
dest: "{{ matrix_base_data_path }}/static-files/public/.well-known/matrix/client"
mode: '0644'
owner: "{{ matrix_user_username }}"
group: "{{ matrix_user_groupname }}"
group: "{{ matrix_user_groupname }}"

View File

@ -9,4 +9,4 @@
with_items:
- {'name': 'matrix_element_call_base_path', when: true}
- {'name': 'matrix_element_call_container_network', when: true}
- {'name': 'matrix_element_call_image', when: true}
- {'name': 'matrix_element_call_image', when: true}

View File

@ -8,4 +8,4 @@
"livekit": {
"livekit_service_url": "{{ matrix_jwt_service_url }}"
}
}
}

View File

@ -43,4 +43,4 @@ traefik.http.routers.matrix-element-call.tls.certResolver={{ matrix_element_call
{% endif %}
{{ matrix_element_call_container_labels_additional_labels }}
{{ matrix_element_call_container_labels_additional_labels }}

View File

@ -43,4 +43,4 @@ RestartSec=30
SyslogIdentifier=matrix-element-call
[Install]
WantedBy=multi-user.target
WantedBy=multi-user.target

View File

@ -2,4 +2,4 @@
"call": {
"widget_url": "https://{{ matrix_element_call_domain }}"
}
}
}

View File

@ -16,7 +16,7 @@ matrix_jwt_service_image: "ghcr.io/element-hq/lk-jwt-service:latest-ci"
# Ports
matrix_jwt_service_port: "8881"
# jwt configuration
# jwt configuration
matrix_jwt_service_hostname: "sfu-jwt.{{ matrix_domain }}"
matrix_jwt_service_url: "https://sfu-jwt.{{ matrix_domain }}"

View File

@ -18,4 +18,4 @@
- setup-jwt-service
block:
- when: not matrix_jwt_service_enabled | bool
ansible.builtin.include_tasks: "{{ role_path }}/tasks/uninstall.yml"
ansible.builtin.include_tasks: "{{ role_path }}/tasks/uninstall.yml"

View File

@ -19,4 +19,4 @@
- name: Reload systemd daemon
ansible.builtin.systemd:
daemon_reload: true
daemon_reload: true

View File

@ -9,4 +9,4 @@
with_items:
- {'name': 'matrix_jwt_service_base_path', when: true}
- {'name': 'matrix_jwt_service_container_network', when: true}
- {'name': 'matrix_jwt_service_image', when: true}
- {'name': 'matrix_jwt_service_image', when: true}

View File

@ -43,4 +43,4 @@ traefik.http.routers.matrix-jwt-service.tls.certResolver={{ matrix_jwt_service_c
{% endif %}
{{ matrix_jwt_service_container_labels_additional_labels }}
{{ matrix_jwt_service_container_labels_additional_labels }}

View File

@ -1,3 +1,4 @@
#jinja2: lstrip_blocks: "True"
[Unit]
Description=Matrix JWT Service
After=docker.service
@ -36,4 +37,4 @@ RestartSec=30
SyslogIdentifier=matrix-jwt-service
[Install]
WantedBy=multi-user.target
WantedBy=multi-user.target

View File

@ -18,4 +18,4 @@
- setup-livekit-server
block:
- when: not matrix_livekit_server_enabled | bool
ansible.builtin.include_tasks: "{{ role_path }}/tasks/uninstall.yml"
ansible.builtin.include_tasks: "{{ role_path }}/tasks/uninstall.yml"

View File

@ -18,4 +18,4 @@
- name: Reload systemd daemon
ansible.builtin.systemd:
daemon_reload: true
daemon_reload: true

View File

@ -10,4 +10,4 @@
- {'name': 'matrix_livekit_server_base_path', when: true}
- {'name': 'matrix_livekit_server_container_network', when: true}
- {'name': 'matrix_livekit_server_image', when: true}
- {'name': 'matrix_livekit_server_image', when: true}
- {'name': 'matrix_livekit_server_image', when: true}

View File

@ -43,4 +43,4 @@ traefik.http.routers.matrix-livekit-server.tls.certResolver={{ matrix_livekit_se
{% endif %}
{{ matrix_livekit_server_container_labels_additional_labels }}
{{ matrix_livekit_server_container_labels_additional_labels }}

View File

@ -17,4 +17,4 @@ turn:
external_tls: true
keys:
devkey: "{{ matrix_livekit_server_livekit_dev_key }}"
devkey: "{{ matrix_livekit_server_livekit_dev_key }}"

View File

@ -31,4 +31,4 @@ RestartSec=30
SyslogIdentifier=matrix-livekit-server
[Install]
WantedBy=multi-user.target
WantedBy=multi-user.target