From a03f5985a536e461653bfc30dc6ccc8372180d25 Mon Sep 17 00:00:00 2001 From: wjbeckett Date: Thu, 3 Oct 2024 12:38:34 +1000 Subject: [PATCH] removed trailing whitespaces --- docs/configuring-playbook-livekit-server.md | 2 +- group_vars/matrix_servers | 3 +-- roles/custom/matrix-element-call/defaults/main.yml | 2 +- roles/custom/matrix-element-call/tasks/install.yml | 4 +--- roles/custom/matrix-element-call/tasks/main.yml | 2 +- roles/custom/matrix-element-call/tasks/uninstall.yml | 2 +- .../matrix-element-call/tasks/update_element_web_config.yml | 5 +++-- .../matrix-element-call/tasks/update_well_known_client.yml | 2 +- roles/custom/matrix-element-call/tasks/validate_config.yml | 2 +- roles/custom/matrix-element-call/templates/config.json.j2 | 2 +- .../matrix-element-call/templates/element-call-labels.j2 | 2 +- .../templates/systemd/matrix-element-call.service.j2 | 2 +- .../matrix-element-call/templates/well_known_element.json.j2 | 2 +- roles/custom/matrix-jwt-service/defaults/main.yml | 2 +- roles/custom/matrix-jwt-service/tasks/main.yml | 2 +- roles/custom/matrix-jwt-service/tasks/uninstall.yml | 2 +- roles/custom/matrix-jwt-service/tasks/validate_config.yml | 2 +- roles/custom/matrix-jwt-service/templates/labels.j2 | 2 +- .../templates/systemd/matrix-jwt-service.service.j2 | 3 ++- roles/custom/matrix-livekit-server/tasks/main.yml | 2 +- roles/custom/matrix-livekit-server/tasks/uninstall.yml | 2 +- roles/custom/matrix-livekit-server/tasks/validate_config.yml | 2 +- roles/custom/matrix-livekit-server/templates/labels.j2 | 2 +- roles/custom/matrix-livekit-server/templates/livekit.yaml.j2 | 2 +- .../templates/systemd/matrix-livekit-server.service.j2 | 2 +- 25 files changed, 28 insertions(+), 29 deletions(-) diff --git a/docs/configuring-playbook-livekit-server.md b/docs/configuring-playbook-livekit-server.md index dd1b4b229..309d9ecf3 100644 --- a/docs/configuring-playbook-livekit-server.md +++ b/docs/configuring-playbook-livekit-server.md @@ -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 diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index 97c5e3b41..3df71e737 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -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 diff --git a/roles/custom/matrix-element-call/defaults/main.yml b/roles/custom/matrix-element-call/defaults/main.yml index 02c910734..567553179 100644 --- a/roles/custom/matrix-element-call/defaults/main.yml +++ b/roles/custom/matrix-element-call/defaults/main.yml @@ -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 \ No newline at end of file diff --git a/roles/custom/matrix-element-call/tasks/install.yml b/roles/custom/matrix-element-call/tasks/install.yml index dd401e89c..ca6b5903b 100644 --- a/roles/custom/matrix-element-call/tasks/install.yml +++ b/roles/custom/matrix-element-call/tasks/install.yml @@ -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 \ No newline at end of file diff --git a/roles/custom/matrix-element-call/tasks/main.yml b/roles/custom/matrix-element-call/tasks/main.yml index ad50c2d96..183c0c6ed 100644 --- a/roles/custom/matrix-element-call/tasks/main.yml +++ b/roles/custom/matrix-element-call/tasks/main.yml @@ -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" \ No newline at end of file diff --git a/roles/custom/matrix-element-call/tasks/uninstall.yml b/roles/custom/matrix-element-call/tasks/uninstall.yml index 184f88ac2..c93837b63 100644 --- a/roles/custom/matrix-element-call/tasks/uninstall.yml +++ b/roles/custom/matrix-element-call/tasks/uninstall.yml @@ -18,4 +18,4 @@ - name: Reload systemd daemon ansible.builtin.systemd: - daemon_reload: true + daemon_reload: true \ No newline at end of file diff --git a/roles/custom/matrix-element-call/tasks/update_element_web_config.yml b/roles/custom/matrix-element-call/tasks/update_element_web_config.yml index 6dd318c24..d4471e7e4 100644 --- a/roles/custom/matrix-element-call/tasks/update_element_web_config.yml +++ b/roles/custom/matrix-element-call/tasks/update_element_web_config.yml @@ -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 \ No newline at end of file diff --git a/roles/custom/matrix-element-call/tasks/update_well_known_client.yml b/roles/custom/matrix-element-call/tasks/update_well_known_client.yml index 96d568c4c..bcf3f726b 100644 --- a/roles/custom/matrix-element-call/tasks/update_well_known_client.yml +++ b/roles/custom/matrix-element-call/tasks/update_well_known_client.yml @@ -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 }}" \ No newline at end of file diff --git a/roles/custom/matrix-element-call/tasks/validate_config.yml b/roles/custom/matrix-element-call/tasks/validate_config.yml index 084e510d6..3b6712727 100644 --- a/roles/custom/matrix-element-call/tasks/validate_config.yml +++ b/roles/custom/matrix-element-call/tasks/validate_config.yml @@ -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} \ No newline at end of file diff --git a/roles/custom/matrix-element-call/templates/config.json.j2 b/roles/custom/matrix-element-call/templates/config.json.j2 index e58648e50..e10fc4f61 100644 --- a/roles/custom/matrix-element-call/templates/config.json.j2 +++ b/roles/custom/matrix-element-call/templates/config.json.j2 @@ -8,4 +8,4 @@ "livekit": { "livekit_service_url": "{{ matrix_jwt_service_url }}" } -} +} \ No newline at end of file diff --git a/roles/custom/matrix-element-call/templates/element-call-labels.j2 b/roles/custom/matrix-element-call/templates/element-call-labels.j2 index cfc5c72f7..685a56294 100644 --- a/roles/custom/matrix-element-call/templates/element-call-labels.j2 +++ b/roles/custom/matrix-element-call/templates/element-call-labels.j2 @@ -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 }} \ No newline at end of file diff --git a/roles/custom/matrix-element-call/templates/systemd/matrix-element-call.service.j2 b/roles/custom/matrix-element-call/templates/systemd/matrix-element-call.service.j2 index 791c62ddc..dcb3fa7c2 100644 --- a/roles/custom/matrix-element-call/templates/systemd/matrix-element-call.service.j2 +++ b/roles/custom/matrix-element-call/templates/systemd/matrix-element-call.service.j2 @@ -43,4 +43,4 @@ RestartSec=30 SyslogIdentifier=matrix-element-call [Install] -WantedBy=multi-user.target +WantedBy=multi-user.target \ No newline at end of file diff --git a/roles/custom/matrix-element-call/templates/well_known_element.json.j2 b/roles/custom/matrix-element-call/templates/well_known_element.json.j2 index eae63cf83..01146e656 100644 --- a/roles/custom/matrix-element-call/templates/well_known_element.json.j2 +++ b/roles/custom/matrix-element-call/templates/well_known_element.json.j2 @@ -2,4 +2,4 @@ "call": { "widget_url": "https://{{ matrix_element_call_domain }}" } -} +} \ No newline at end of file diff --git a/roles/custom/matrix-jwt-service/defaults/main.yml b/roles/custom/matrix-jwt-service/defaults/main.yml index 97d58a273..ee95afefd 100644 --- a/roles/custom/matrix-jwt-service/defaults/main.yml +++ b/roles/custom/matrix-jwt-service/defaults/main.yml @@ -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 }}" diff --git a/roles/custom/matrix-jwt-service/tasks/main.yml b/roles/custom/matrix-jwt-service/tasks/main.yml index ee74a8967..8fbe41d58 100644 --- a/roles/custom/matrix-jwt-service/tasks/main.yml +++ b/roles/custom/matrix-jwt-service/tasks/main.yml @@ -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" \ No newline at end of file diff --git a/roles/custom/matrix-jwt-service/tasks/uninstall.yml b/roles/custom/matrix-jwt-service/tasks/uninstall.yml index 550c82951..7338d5b95 100644 --- a/roles/custom/matrix-jwt-service/tasks/uninstall.yml +++ b/roles/custom/matrix-jwt-service/tasks/uninstall.yml @@ -19,4 +19,4 @@ - name: Reload systemd daemon ansible.builtin.systemd: - daemon_reload: true + daemon_reload: true \ No newline at end of file diff --git a/roles/custom/matrix-jwt-service/tasks/validate_config.yml b/roles/custom/matrix-jwt-service/tasks/validate_config.yml index a0105e940..38e39ad60 100644 --- a/roles/custom/matrix-jwt-service/tasks/validate_config.yml +++ b/roles/custom/matrix-jwt-service/tasks/validate_config.yml @@ -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} \ No newline at end of file diff --git a/roles/custom/matrix-jwt-service/templates/labels.j2 b/roles/custom/matrix-jwt-service/templates/labels.j2 index b547e1952..6db772236 100644 --- a/roles/custom/matrix-jwt-service/templates/labels.j2 +++ b/roles/custom/matrix-jwt-service/templates/labels.j2 @@ -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 }} \ No newline at end of file diff --git a/roles/custom/matrix-jwt-service/templates/systemd/matrix-jwt-service.service.j2 b/roles/custom/matrix-jwt-service/templates/systemd/matrix-jwt-service.service.j2 index bdf36635a..b940e75a2 100644 --- a/roles/custom/matrix-jwt-service/templates/systemd/matrix-jwt-service.service.j2 +++ b/roles/custom/matrix-jwt-service/templates/systemd/matrix-jwt-service.service.j2 @@ -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 \ No newline at end of file diff --git a/roles/custom/matrix-livekit-server/tasks/main.yml b/roles/custom/matrix-livekit-server/tasks/main.yml index 255906c75..1884596b8 100644 --- a/roles/custom/matrix-livekit-server/tasks/main.yml +++ b/roles/custom/matrix-livekit-server/tasks/main.yml @@ -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" \ No newline at end of file diff --git a/roles/custom/matrix-livekit-server/tasks/uninstall.yml b/roles/custom/matrix-livekit-server/tasks/uninstall.yml index 371db5c83..0709dca12 100644 --- a/roles/custom/matrix-livekit-server/tasks/uninstall.yml +++ b/roles/custom/matrix-livekit-server/tasks/uninstall.yml @@ -18,4 +18,4 @@ - name: Reload systemd daemon ansible.builtin.systemd: - daemon_reload: true + daemon_reload: true \ No newline at end of file diff --git a/roles/custom/matrix-livekit-server/tasks/validate_config.yml b/roles/custom/matrix-livekit-server/tasks/validate_config.yml index 7fdfa0511..ddf750b9b 100644 --- a/roles/custom/matrix-livekit-server/tasks/validate_config.yml +++ b/roles/custom/matrix-livekit-server/tasks/validate_config.yml @@ -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} \ No newline at end of file diff --git a/roles/custom/matrix-livekit-server/templates/labels.j2 b/roles/custom/matrix-livekit-server/templates/labels.j2 index c41b7ed01..77a3ce426 100644 --- a/roles/custom/matrix-livekit-server/templates/labels.j2 +++ b/roles/custom/matrix-livekit-server/templates/labels.j2 @@ -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 }} \ No newline at end of file diff --git a/roles/custom/matrix-livekit-server/templates/livekit.yaml.j2 b/roles/custom/matrix-livekit-server/templates/livekit.yaml.j2 index 492a12214..77ac841a8 100644 --- a/roles/custom/matrix-livekit-server/templates/livekit.yaml.j2 +++ b/roles/custom/matrix-livekit-server/templates/livekit.yaml.j2 @@ -17,4 +17,4 @@ turn: external_tls: true keys: - devkey: "{{ matrix_livekit_server_livekit_dev_key }}" + devkey: "{{ matrix_livekit_server_livekit_dev_key }}" \ No newline at end of file diff --git a/roles/custom/matrix-livekit-server/templates/systemd/matrix-livekit-server.service.j2 b/roles/custom/matrix-livekit-server/templates/systemd/matrix-livekit-server.service.j2 index 30505a2dc..ddaa35181 100644 --- a/roles/custom/matrix-livekit-server/templates/systemd/matrix-livekit-server.service.j2 +++ b/roles/custom/matrix-livekit-server/templates/systemd/matrix-livekit-server.service.j2 @@ -31,4 +31,4 @@ RestartSec=30 SyslogIdentifier=matrix-livekit-server [Install] -WantedBy=multi-user.target +WantedBy=multi-user.target \ No newline at end of file