Parcourir la source

removed trailing whitespaces

element-call-integration
wjbeckett il y a 1 an
Parent
révision
a03f5985a5
25 fichiers modifiés avec 28 ajouts et 29 suppressions
  1. +1
    -1
      docs/configuring-playbook-livekit-server.md
  2. +1
    -2
      group_vars/matrix_servers
  3. +1
    -1
      roles/custom/matrix-element-call/defaults/main.yml
  4. +1
    -3
      roles/custom/matrix-element-call/tasks/install.yml
  5. +1
    -1
      roles/custom/matrix-element-call/tasks/main.yml
  6. +1
    -1
      roles/custom/matrix-element-call/tasks/uninstall.yml
  7. +3
    -2
      roles/custom/matrix-element-call/tasks/update_element_web_config.yml
  8. +1
    -1
      roles/custom/matrix-element-call/tasks/update_well_known_client.yml
  9. +1
    -1
      roles/custom/matrix-element-call/tasks/validate_config.yml
  10. +1
    -1
      roles/custom/matrix-element-call/templates/config.json.j2
  11. +1
    -1
      roles/custom/matrix-element-call/templates/element-call-labels.j2
  12. +1
    -1
      roles/custom/matrix-element-call/templates/systemd/matrix-element-call.service.j2
  13. +1
    -1
      roles/custom/matrix-element-call/templates/well_known_element.json.j2
  14. +1
    -1
      roles/custom/matrix-jwt-service/defaults/main.yml
  15. +1
    -1
      roles/custom/matrix-jwt-service/tasks/main.yml
  16. +1
    -1
      roles/custom/matrix-jwt-service/tasks/uninstall.yml
  17. +1
    -1
      roles/custom/matrix-jwt-service/tasks/validate_config.yml
  18. +1
    -1
      roles/custom/matrix-jwt-service/templates/labels.j2
  19. +2
    -1
      roles/custom/matrix-jwt-service/templates/systemd/matrix-jwt-service.service.j2
  20. +1
    -1
      roles/custom/matrix-livekit-server/tasks/main.yml
  21. +1
    -1
      roles/custom/matrix-livekit-server/tasks/uninstall.yml
  22. +1
    -1
      roles/custom/matrix-livekit-server/tasks/validate_config.yml
  23. +1
    -1
      roles/custom/matrix-livekit-server/templates/labels.j2
  24. +1
    -1
      roles/custom/matrix-livekit-server/templates/livekit.yaml.j2
  25. +1
    -1
      roles/custom/matrix-livekit-server/templates/systemd/matrix-livekit-server.service.j2

+ 1
- 1
docs/configuring-playbook-livekit-server.md Voir le fichier

@@ -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



+ 1
- 2
group_vars/matrix_servers Voir le fichier

@@ -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


+ 1
- 1
roles/custom/matrix-element-call/defaults/main.yml Voir le fichier

@@ -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

+ 1
- 3
roles/custom/matrix-element-call/tasks/install.yml Voir le fichier

@@ -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

+ 1
- 1
roles/custom/matrix-element-call/tasks/main.yml Voir le fichier

@@ -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"

+ 1
- 1
roles/custom/matrix-element-call/tasks/uninstall.yml Voir le fichier

@@ -18,4 +18,4 @@

- name: Reload systemd daemon
ansible.builtin.systemd:
daemon_reload: true
daemon_reload: true

+ 3
- 2
roles/custom/matrix-element-call/tasks/update_element_web_config.yml Voir le fichier

@@ -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

+ 1
- 1
roles/custom/matrix-element-call/tasks/update_well_known_client.yml Voir le fichier

@@ -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 }}"

+ 1
- 1
roles/custom/matrix-element-call/tasks/validate_config.yml Voir le fichier

@@ -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}

+ 1
- 1
roles/custom/matrix-element-call/templates/config.json.j2 Voir le fichier

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

+ 1
- 1
roles/custom/matrix-element-call/templates/element-call-labels.j2 Voir le fichier

@@ -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 }}

+ 1
- 1
roles/custom/matrix-element-call/templates/systemd/matrix-element-call.service.j2 Voir le fichier

@@ -43,4 +43,4 @@ RestartSec=30
SyslogIdentifier=matrix-element-call

[Install]
WantedBy=multi-user.target
WantedBy=multi-user.target

+ 1
- 1
roles/custom/matrix-element-call/templates/well_known_element.json.j2 Voir le fichier

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

+ 1
- 1
roles/custom/matrix-jwt-service/defaults/main.yml Voir le fichier

@@ -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 }}"



+ 1
- 1
roles/custom/matrix-jwt-service/tasks/main.yml Voir le fichier

@@ -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"

+ 1
- 1
roles/custom/matrix-jwt-service/tasks/uninstall.yml Voir le fichier

@@ -19,4 +19,4 @@

- name: Reload systemd daemon
ansible.builtin.systemd:
daemon_reload: true
daemon_reload: true

+ 1
- 1
roles/custom/matrix-jwt-service/tasks/validate_config.yml Voir le fichier

@@ -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}

+ 1
- 1
roles/custom/matrix-jwt-service/templates/labels.j2 Voir le fichier

@@ -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 }}

+ 2
- 1
roles/custom/matrix-jwt-service/templates/systemd/matrix-jwt-service.service.j2 Voir le fichier

@@ -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

+ 1
- 1
roles/custom/matrix-livekit-server/tasks/main.yml Voir le fichier

@@ -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"

+ 1
- 1
roles/custom/matrix-livekit-server/tasks/uninstall.yml Voir le fichier

@@ -18,4 +18,4 @@

- name: Reload systemd daemon
ansible.builtin.systemd:
daemon_reload: true
daemon_reload: true

+ 1
- 1
roles/custom/matrix-livekit-server/tasks/validate_config.yml Voir le fichier

@@ -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}

+ 1
- 1
roles/custom/matrix-livekit-server/templates/labels.j2 Voir le fichier

@@ -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 }}

+ 1
- 1
roles/custom/matrix-livekit-server/templates/livekit.yaml.j2 Voir le fichier

@@ -17,4 +17,4 @@ turn:
external_tls: true

keys:
devkey: "{{ matrix_livekit_server_livekit_dev_key }}"
devkey: "{{ matrix_livekit_server_livekit_dev_key }}"

+ 1
- 1
roles/custom/matrix-livekit-server/templates/systemd/matrix-livekit-server.service.j2 Voir le fichier

@@ -31,4 +31,4 @@ RestartSec=30
SyslogIdentifier=matrix-livekit-server

[Install]
WantedBy=multi-user.target
WantedBy=multi-user.target

Chargement…
Annuler
Enregistrer