diff --git a/docs/configuring-playbook-element-call.md b/docs/configuring-playbook-element-call.md index 6a6b5a496..d94357f55 100644 --- a/docs/configuring-playbook-element-call.md +++ b/docs/configuring-playbook-element-call.md @@ -34,10 +34,10 @@ Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars. # Enable dependent services keydb_enabled: true matrix_element_call_enabled: true -matrix_livekit_server_enabled: true +livekit_server_enabled: true matrix_jwt_service_enabled: true # Set a secure key for LiveKit authentication -matrix_livekit_server_dev_key: 'your-secure-livekit-key' +livekit_server_dev_key: 'your-secure-livekit-key' ``` ## Installing @@ -68,4 +68,4 @@ Ensure these ports are open and forwarded appropriately to allow traffic to flow ## Additional Information -Refer to the Element Call documentation for more details on configuring and using Element Call. \ No newline at end of file +Refer to the Element Call documentation for more details on configuring and using Element Call. diff --git a/docs/configuring-playbook-livekit-server.md b/docs/configuring-playbook-livekit-server.md index 309d9ecf3..91a75f80c 100644 --- a/docs/configuring-playbook-livekit-server.md +++ b/docs/configuring-playbook-livekit-server.md @@ -8,11 +8,11 @@ See the project's [documentation](https://github.com/livekit/livekit) to learn m ## Decide on a domain and path -By default, Livekit is configured to be served on the Matrix domain (`sfu.DOMAIN`, controlled by the `matrix_livekit_server_hostname` variable). +By default, Livekit is configured to be served on the Matrix domain (`sfu.DOMAIN`, controlled by the `livekit_server_hostname` variable). This makes it easy to set it up, **without** having to adjust your DNS records manually. -If you'd like to run Livekit on another hostname or path, use the `matrix_livekit_server_hostname` variable. +If you'd like to run Livekit on another hostname or path, use the `livekit_server_hostname` variable. ## Adjusting DNS records @@ -26,7 +26,7 @@ Ensure that the following DNS names have a public IP/FQDN: Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: ```yaml -matrix_livekit_server_enabled: true +livekit_server_enabled: true # Set a secure key for LiveKit authentication matrix_element_call_livekit_dev_key: 'your-secure-livekit-key' ``` @@ -53,4 +53,4 @@ Ensure these ports are open and forwarded appropriately to allow traffic to flow ## Additional Information -Refer to the Livekit documentation for more details on configuring and using Livekit. \ No newline at end of file +Refer to the Livekit documentation for more details on configuring and using Livekit. diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index f60b2a041..6b5b6d53c 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -442,7 +442,7 @@ devture_systemd_service_manager_services_list_auto: | + ([{'name': 'matrix-jwt-service.service', 'priority': 3000, 'groups': ['matrix', 'jwt-service']}] if matrix_jwt_service_enabled else []) + - ([{'name': 'matrix-livekit-server.service', 'priority': 3000, 'groups': ['matrix', 'livekit-server']}] if matrix_livekit_server_enabled else []) + ([{'name': 'matrix-livekit-server.service', 'priority': 3000, 'groups': ['matrix', 'livekit-server']}] if livekit_server_enabled else []) + ([{'name': 'matrix-registration.service', 'priority': 4000, 'groups': ['matrix', 'registration', 'matrix-registration']}] if matrix_registration_enabled else []) + @@ -6063,27 +6063,27 @@ matrix_element_call_container_labels_traefik_tls_certResolver: "{{ traefik_certR ######################################################################## # Matrix Livekit Server Configuration -matrix_livekit_server_enabled: false # Default is false; should be enabled in host_vars as needed -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_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 +livekit_server_enabled: false # Default is false; should be enabled in host_vars as needed +livekit_server_version: "latest" # Default version; can be overridden in host_vars +livekit_server_scheme: "https" +livekit_server_hostname: "sfu.{{ matrix_domain }}" # Default hostname; should be overridden in host_vars if different +livekit_server_path_prefix: "/" +livekit_server_base_path: "{{ matrix_base_data_path }}/livekit-server" +livekit_server_container_image: "livekit/livekit-server:{{ livekit_server_version }}" +livekit_server_container_image_force_pull: true # Docker network configuration for Livekit -matrix_livekit_server_container_network: "{{ matrix_addons_container_network }}" -matrix_livekit_server_container_additional_networks: "{{ [matrix_playbook_reverse_proxyable_services_additional_network] if (matrix_livekit_server_container_labels_traefik_enabled and matrix_playbook_reverse_proxyable_services_additional_network) else [] }}" +livekit_server_container_network: "{{ matrix_addons_container_network }}" +livekit_server_container_additional_networks: "{{ [matrix_playbook_reverse_proxyable_services_additional_network] if (livekit_server_container_labels_traefik_enabled and matrix_playbook_reverse_proxyable_services_additional_network) else [] }}" # Traefik Configuration for Livekit matrix_livekit_container_labels_traefik_enabled: "{{ matrix_playbook_reverse_proxy_type in ['playbook-managed-traefik', 'other-traefik-container'] }}" matrix_livekit_container_labels_traefik_docker_network: "{{ matrix_playbook_reverse_proxyable_services_additional_network }}" -matrix_livekit_server_container_labels_traefik_entrypoints: "{{ traefik_entrypoint_primary }}" -matrix_livekit_server_container_labels_traefik_tls_certResolver: "{{ traefik_certResolver_primary }}" +livekit_server_container_labels_traefik_entrypoints: "{{ traefik_entrypoint_primary }}" +livekit_server_container_labels_traefik_tls_certResolver: "{{ traefik_certResolver_primary }}" # LiveKit Service Configuration -matrix_livekit_server_livekit_dev_key: "{{ matrix_livekit_server_dev_key }}" # LiveKit dev key +livekit_server_livekit_dev_key: "{{ livekit_server_dev_key }}" # LiveKit dev key ######################################################################## # # @@ -6126,4 +6126,4 @@ matrix_jwt_service_url: "https://sfu-jwt.{{ matrix_domain }}" # Default JWT ser # # # /matrix-jwt-service # # # -######################################################################## \ No newline at end of file +######################################################################## diff --git a/roles/custom/matrix-jwt-service/templates/env.j2 b/roles/custom/matrix-jwt-service/templates/env.j2 index 4bb12aaf5..7135bb087 100644 --- a/roles/custom/matrix-jwt-service/templates/env.j2 +++ b/roles/custom/matrix-jwt-service/templates/env.j2 @@ -1,4 +1,4 @@ # Environment variables for JWT Service LIVEKIT_KEY=devkey -LIVEKIT_URL=wss://{{ matrix_livekit_server_hostname }}:443 -LIVEKIT_SECRET={{ matrix_livekit_server_dev_key }} \ No newline at end of file +LIVEKIT_URL=wss://{{ livekit_server_hostname }}:443 +LIVEKIT_SECRET={{ livekit_server_dev_key }} diff --git a/roles/custom/matrix-livekit-server/defaults/main.yml b/roles/custom/matrix-livekit-server/defaults/main.yml index 8175af0ea..c20f7247f 100644 --- a/roles/custom/matrix-livekit-server/defaults/main.yml +++ b/roles/custom/matrix-livekit-server/defaults/main.yml @@ -1,49 +1,49 @@ --- # Enable or disable matrix-livekit-server deployment -matrix_livekit_server_enabled: false +livekit_server_enabled: false # Base path configuration -matrix_livekit_server_base_path: "{{ matrix_base_data_path }}/livekit-server" +livekit_server_base_path: "{{ matrix_base_data_path }}/livekit-server" # Docker network configuration -matrix_livekit_server_container_network: '' -matrix_livekit_server_container_http_host_bind_port: '' -matrix_livekit_server_container_additional_networks: [] # No additional networks by default +livekit_server_container_network: '' +livekit_server_container_http_host_bind_port: '' +livekit_server_container_additional_networks: [] # No additional networks by default # Docker images -matrix_livekit_server_image: "livekit/livekit-server:latest" +livekit_server_image: "livekit/livekit-server:latest" # LiveKit configuration -matrix_livekit_server_livekit_server_dev_key: "{{ matrix_livekit_server_dev_key }}" # Must be defined in host_vars -matrix_livekit_server_jwt_secret: "{{ matrix_element_call_jwt_secret }}" # Must be defined in host_vars -matrix_livekit_server_hostname: "sfu.{{ matrix_domain }}" +livekit_server_livekit_server_dev_key: "{{ livekit_server_dev_key }}" # Must be defined in host_vars +livekit_server_jwt_secret: "{{ matrix_element_call_jwt_secret }}" # Must be defined in host_vars +livekit_server_hostname: "sfu.{{ matrix_domain }}" # Traefik Configuration for Element Call -matrix_livekit_server_container_labels_traefik_enabled: true -matrix_livekit_server_container_labels_traefik_docker_network: "{{ matrix_livekit_server_container_network }}" -matrix_livekit_server_container_labels_traefik_hostname: "{{ matrix_livekit_server_hostname }}" +livekit_server_container_labels_traefik_enabled: true +livekit_server_container_labels_traefik_docker_network: "{{ livekit_server_container_network }}" +livekit_server_container_labels_traefik_hostname: "{{ livekit_server_hostname }}" # The path prefix must either be `/` or not end with a slash (e.g. `/element`). -matrix_livekit_server_container_labels_traefik_path_prefix: "{{ matrix_livekit_server_path_prefix }}" -matrix_livekit_server_container_labels_traefik_rule: "Host(`{{ matrix_livekit_server_container_labels_traefik_hostname }}`){% if matrix_livekit_server_container_labels_traefik_path_prefix != '/' %} && PathPrefix(`{{ matrix_livekit_server_container_labels_traefik_path_prefix }}`){% endif %}" -matrix_livekit_server_container_labels_traefik_priority: 0 -matrix_livekit_server_container_labels_traefik_entrypoints: web-secure -matrix_livekit_server_container_labels_traefik_tls: "{{ matrix_livekit_server_container_labels_traefik_entrypoints != 'web' }}" -matrix_livekit_server_container_labels_traefik_tls_certResolver: default # noqa var-naming +livekit_server_container_labels_traefik_path_prefix: "{{ livekit_server_path_prefix }}" +livekit_server_container_labels_traefik_rule: "Host(`{{ livekit_server_container_labels_traefik_hostname }}`){% if livekit_server_container_labels_traefik_path_prefix != '/' %} && PathPrefix(`{{ livekit_server_container_labels_traefik_path_prefix }}`){% endif %}" +livekit_server_container_labels_traefik_priority: 0 +livekit_server_container_labels_traefik_entrypoints: web-secure +livekit_server_container_labels_traefik_tls: "{{ livekit_server_container_labels_traefik_entrypoints != 'web' }}" +livekit_server_container_labels_traefik_tls_certResolver: default # noqa var-naming # Controls which additional headers to attach to all HTTP responses. -# To add your own headers, use `matrix_livekit_server_container_labels_traefik_additional_response_headers_custom` -matrix_livekit_server_container_labels_traefik_additional_response_headers: "{{ matrix_livekit_server_container_labels_traefik_additional_response_headers_auto | combine(matrix_livekit_server_container_labels_traefik_additional_response_headers_custom) }}" -matrix_livekit_server_container_labels_traefik_additional_response_headers_auto: | +# To add your own headers, use `livekit_server_container_labels_traefik_additional_response_headers_custom` +livekit_server_container_labels_traefik_additional_response_headers: "{{ livekit_server_container_labels_traefik_additional_response_headers_auto | combine(livekit_server_container_labels_traefik_additional_response_headers_custom) }}" +livekit_server_container_labels_traefik_additional_response_headers_auto: | {{ {} - | combine ({'X-XSS-Protection': matrix_livekit_server_http_header_xss_protection} if matrix_livekit_server_http_header_xss_protection else {}) - | combine ({'X-Frame-Options': matrix_livekit_server_http_header_frame_options} if matrix_livekit_server_http_header_frame_options else {}) - | combine ({'X-Content-Type-Options': matrix_livekit_server_http_header_content_type_options} if matrix_livekit_server_http_header_content_type_options else {}) - | combine ({'Content-Security-Policy': matrix_livekit_server_http_header_content_security_policy} if matrix_livekit_server_http_header_content_security_policy else {}) - | combine ({'Permission-Policy': matrix_livekit_server_http_header_content_permission_policy} if matrix_livekit_server_http_header_content_permission_policy else {}) - | combine ({'Strict-Transport-Security': matrix_livekit_server_http_header_strict_transport_security} if matrix_livekit_server_http_header_strict_transport_security and matrix_livekit_server_container_labels_traefik_tls else {}) + | combine ({'X-XSS-Protection': livekit_server_http_header_xss_protection} if livekit_server_http_header_xss_protection else {}) + | combine ({'X-Frame-Options': livekit_server_http_header_frame_options} if livekit_server_http_header_frame_options else {}) + | combine ({'X-Content-Type-Options': livekit_server_http_header_content_type_options} if livekit_server_http_header_content_type_options else {}) + | combine ({'Content-Security-Policy': livekit_server_http_header_content_security_policy} if livekit_server_http_header_content_security_policy else {}) + | combine ({'Permission-Policy': livekit_server_http_header_content_permission_policy} if livekit_server_http_header_content_permission_policy else {}) + | combine ({'Strict-Transport-Security': livekit_server_http_header_strict_transport_security} if livekit_server_http_header_strict_transport_security and livekit_server_container_labels_traefik_tls else {}) }} -matrix_livekit_server_container_labels_traefik_additional_response_headers_custom: {} +livekit_server_container_labels_traefik_additional_response_headers_custom: {} # matrix_client_element_container_labels_additional_labels contains a multiline string with additional labels to add to the container label file. # See `../templates/labels.j2` for details. @@ -52,16 +52,16 @@ matrix_livekit_server_container_labels_traefik_additional_response_headers_custo # matrix_client_element_container_labels_additional_labels: | # my.label=1 # another.label="here" -matrix_livekit_server_container_labels_additional_labels: '' +livekit_server_container_labels_additional_labels: '' # A list of extra arguments to pass to the container -matrix_livekit_server_container_extra_arguments: [] +livekit_server_container_extra_arguments: [] # Additional environment variables for the container -matrix_livekit_server_environment_variables_additional: {} +livekit_server_environment_variables_additional: {} # List of systemd services that matrix-element-call.service depends on -matrix_livekit_server_systemd_required_services_list: "{{ [devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [] }}" +livekit_server_systemd_required_services_list: "{{ [devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [] }}" # Specifies the value of the `X-XSS-Protection` header # Stops pages from loading when they detect reflected cross-site scripting (XSS) attacks. @@ -69,27 +69,27 @@ matrix_livekit_server_systemd_required_services_list: "{{ [devture_systemd_docke # Learn more about it is here: # - https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-XSS-Protection # - https://portswigger.net/web-security/cross-site-scripting/reflected -matrix_livekit_server_http_header_xss_protection: '' +livekit_server_http_header_xss_protection: '' # Specifies the value of the `X-Frame-Options` header which controls whether framing can happen. # See: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options -matrix_livekit_server_http_header_frame_options: '' +livekit_server_http_header_frame_options: '' # Specifies the value of the `X-Content-Type-Options` header. # See: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Content-Type-Options -matrix_livekit_server_http_header_content_type_options: '' +livekit_server_http_header_content_type_options: '' # Specifies the value of the `Content-Security-Policy` header. # See: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy -matrix_livekit_server_http_header_content_security_policy: '' +livekit_server_http_header_content_security_policy: '' # Specifies the value of the `Permission-Policy` header. # See: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Permission-Policy -matrix_livekit_server_http_header_content_permission_policy: '' +livekit_server_http_header_content_permission_policy: '' # Specifies the value of the `Strict-Transport-Security` header. # See: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Strict-Transport-Security -matrix_livekit_server_http_header_strict_transport_security: '' +livekit_server_http_header_strict_transport_security: '' # Controls whether to send a "Permissions-Policy interest-cohort=();" header along with all responses # @@ -99,8 +99,8 @@ matrix_livekit_server_http_header_strict_transport_security: '' # - https://amifloced.org/ # # Of course, a better solution is to just stop using browsers (like Chrome), which participate in such tracking practices. -# See: `matrix_livekit_server_content_permission_policy` -matrix_livekit_server_floc_optout_enabled: false +# See: `livekit_server_content_permission_policy` +livekit_server_floc_optout_enabled: false # Controls if HSTS preloading is enabled # @@ -111,5 +111,5 @@ matrix_livekit_server_floc_optout_enabled: false # - https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security # - https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Strict-Transport-Security # - https://hstspreload.org/#opt-in -# See: `matrix_livekit_server_http_header_strict_transport_security` -matrix_livekit_server_hsts_preload_enabled: true \ No newline at end of file +# See: `livekit_server_http_header_strict_transport_security` +livekit_server_hsts_preload_enabled: true diff --git a/roles/custom/matrix-livekit-server/tasks/install.yml b/roles/custom/matrix-livekit-server/tasks/install.yml index 8f348b472..35aec98c2 100644 --- a/roles/custom/matrix-livekit-server/tasks/install.yml +++ b/roles/custom/matrix-livekit-server/tasks/install.yml @@ -10,13 +10,13 @@ owner: "{{ matrix_user_username }}" group: "{{ matrix_user_groupname }}" with_items: - - path: "{{ matrix_livekit_server_base_path }}" + - path: "{{ livekit_server_base_path }}" # Ensure Configuration Files are in Place - name: Ensure LiveKit livekit.yaml is in place ansible.builtin.template: src: "{{ role_path }}/templates/livekit.yaml.j2" - dest: "{{ matrix_livekit_server_base_path }}/livekit.yaml" + dest: "{{ livekit_server_base_path }}/livekit.yaml" mode: 0640 owner: "{{ matrix_user_username }}" group: "{{ matrix_user_groupname }}" @@ -24,7 +24,7 @@ - name: Ensure LiveKit labels file is in place ansible.builtin.template: src: "{{ role_path }}/templates/labels.j2" - dest: "{{ matrix_livekit_server_base_path }}/labels" + dest: "{{ livekit_server_base_path }}/labels" mode: 0640 owner: "{{ matrix_user_username }}" group: "{{ matrix_user_groupname }}" @@ -32,7 +32,7 @@ # Ensure Docker Images are Pulled - name: Ensure LiveKit Docker image is pulled community.docker.docker_image: - name: "{{ matrix_livekit_server_image }}" + name: "{{ livekit_server_image }}" source: pull register: livekit_image_result retries: 3 @@ -44,4 +44,4 @@ ansible.builtin.template: src: "{{ role_path }}/templates/systemd/matrix-livekit-server.service.j2" dest: "{{ devture_systemd_docker_base_systemd_path }}/matrix-livekit-server.service" - mode: 0644 \ No newline at end of file + mode: 0644 diff --git a/roles/custom/matrix-livekit-server/tasks/main.yml b/roles/custom/matrix-livekit-server/tasks/main.yml index 1884596b8..349d63be6 100644 --- a/roles/custom/matrix-livekit-server/tasks/main.yml +++ b/roles/custom/matrix-livekit-server/tasks/main.yml @@ -7,15 +7,15 @@ - install-all - install-livekit-server block: - - when: matrix_livekit_server_enabled | bool + - when: livekit_server_enabled | bool ansible.builtin.include_tasks: "{{ role_path }}/tasks/validate_config.yml" - - when: matrix_livekit_server_enabled | bool + - when: livekit_server_enabled | bool ansible.builtin.include_tasks: "{{ role_path }}/tasks/install.yml" - tags: - setup-all - setup-livekit-server block: - - when: not matrix_livekit_server_enabled | bool - ansible.builtin.include_tasks: "{{ role_path }}/tasks/uninstall.yml" \ No newline at end of file + - when: not livekit_server_enabled | bool + ansible.builtin.include_tasks: "{{ role_path }}/tasks/uninstall.yml" diff --git a/roles/custom/matrix-livekit-server/tasks/validate_config.yml b/roles/custom/matrix-livekit-server/tasks/validate_config.yml index ddf750b9b..0694efed8 100644 --- a/roles/custom/matrix-livekit-server/tasks/validate_config.yml +++ b/roles/custom/matrix-livekit-server/tasks/validate_config.yml @@ -7,7 +7,7 @@ You need to define a required configuration setting (`{{ item.name }}`). when: "item.when | bool and vars[item.name] == ''" with_items: - - {'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} \ No newline at end of file + - {'name': 'livekit_server_base_path', when: true} + - {'name': 'livekit_server_container_network', when: true} + - {'name': 'livekit_server_image', when: true} + - {'name': 'livekit_server_image', when: true} diff --git a/roles/custom/matrix-livekit-server/templates/labels.j2 b/roles/custom/matrix-livekit-server/templates/labels.j2 index 77a3ce426..2200c41ac 100644 --- a/roles/custom/matrix-livekit-server/templates/labels.j2 +++ b/roles/custom/matrix-livekit-server/templates/labels.j2 @@ -1,9 +1,9 @@ -{% if matrix_livekit_server_container_labels_traefik_enabled %} +{% if livekit_server_container_labels_traefik_enabled %} traefik.enable=true # Network configuration for Traefik -{% if matrix_livekit_server_container_labels_traefik_docker_network %} -traefik.docker.network={{ matrix_livekit_server_container_labels_traefik_docker_network }} +{% if livekit_server_container_labels_traefik_docker_network %} +traefik.docker.network={{ livekit_server_container_labels_traefik_docker_network }} {% endif %} traefik.http.services.matrix-livekit-server.loadbalancer.server.port=7880 @@ -11,36 +11,36 @@ traefik.http.services.matrix-livekit-server.loadbalancer.server.port=7880 {% set middlewares = [] %} # Path prefix handling for Livekit -{% if matrix_livekit_server_container_labels_traefik_path_prefix != '/' %} -traefik.http.middlewares.matrix-livekit-server-slashless-redirect.redirectregex.regex=({{ matrix_livekit_server_container_labels_traefik_path_prefix | quote }})$ +{% if livekit_server_container_labels_traefik_path_prefix != '/' %} +traefik.http.middlewares.matrix-livekit-server-slashless-redirect.redirectregex.regex=({{ livekit_server_container_labels_traefik_path_prefix | quote }})$ traefik.http.middlewares.matrix-livekit-server-slashless-redirect.redirectregex.replacement=${1}/ {% set middlewares = middlewares + ['matrix-livekit-server-slashless-redirect'] %} -traefik.http.middlewares.matrix-livekit-server-strip-prefix.stripprefix.prefixes={{ matrix_livekit_server_container_labels_traefik_path_prefix }} +traefik.http.middlewares.matrix-livekit-server-strip-prefix.stripprefix.prefixes={{ livekit_server_container_labels_traefik_path_prefix }} {% set middlewares = middlewares + ['matrix-livekit-server-strip-prefix'] %} {% endif %} -{% if matrix_livekit_server_container_labels_traefik_additional_response_headers.keys() | length > 0 %} -{% for name, value in matrix_livekit_server_container_labels_traefik_additional_response_headers.items() %} +{% if livekit_server_container_labels_traefik_additional_response_headers.keys() | length > 0 %} +{% for name, value in livekit_server_container_labels_traefik_additional_response_headers.items() %} traefik.http.middlewares.matrix-livekit-server-add-headers.headers.customresponseheaders.{{ name }}={{ value }} {% endfor %} {% set middlewares = middlewares + ['matrix-livekit-server-add-headers'] %} {% endif %} -traefik.http.routers.matrix-livekit-server.rule={{ matrix_livekit_server_container_labels_traefik_rule }} -{% if matrix_livekit_server_container_labels_traefik_priority | int > 0 %} -traefik.http.routers.matrix-livekit-server.priority={{ matrix_livekit_server_container_labels_traefik_priority }} +traefik.http.routers.matrix-livekit-server.rule={{ livekit_server_container_labels_traefik_rule }} +{% if livekit_server_container_labels_traefik_priority | int > 0 %} +traefik.http.routers.matrix-livekit-server.priority={{ livekit_server_container_labels_traefik_priority }} {% endif %} traefik.http.routers.matrix-livekit-server.service=matrix-livekit-server {% if middlewares | length > 0 %} traefik.http.routers.matrix-livekit-server.middlewares={{ middlewares | join(',') }} {% endif %} -traefik.http.routers.matrix-livekit-server.entrypoints={{ matrix_livekit_server_container_labels_traefik_entrypoints }} -traefik.http.routers.matrix-livekit-server.tls={{ matrix_livekit_server_container_labels_traefik_tls | to_json }} -{% if matrix_livekit_server_container_labels_traefik_tls %} -traefik.http.routers.matrix-livekit-server.tls.certResolver={{ matrix_livekit_server_container_labels_traefik_tls_certResolver }} +traefik.http.routers.matrix-livekit-server.entrypoints={{ livekit_server_container_labels_traefik_entrypoints }} +traefik.http.routers.matrix-livekit-server.tls={{ livekit_server_container_labels_traefik_tls | to_json }} +{% if livekit_server_container_labels_traefik_tls %} +traefik.http.routers.matrix-livekit-server.tls.certResolver={{ livekit_server_container_labels_traefik_tls_certResolver }} {% endif %} {% endif %} -{{ matrix_livekit_server_container_labels_additional_labels }} \ No newline at end of file +{{ livekit_server_container_labels_additional_labels }} diff --git a/roles/custom/matrix-livekit-server/templates/livekit.yaml.j2 b/roles/custom/matrix-livekit-server/templates/livekit.yaml.j2 index 77ac841a8..04fcb1170 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 }}" \ No newline at end of file + devkey: "{{ livekit_server_livekit_dev_key }}" 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 ddaa35181..98c19e4dc 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 @@ -17,9 +17,9 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ --user={{ matrix_user_uid }}:{{ matrix_user_gid }} \ --cap-drop=ALL \ --network=host \ - --mount type=bind,src={{ matrix_livekit_server_base_path }}/livekit.yaml,dst=/etc/livekit.yaml,ro \ - --label-file={{ matrix_livekit_server_base_path }}/labels \ - {{ matrix_livekit_server_image }} \ + --mount type=bind,src={{ livekit_server_base_path }}/livekit.yaml,dst=/etc/livekit.yaml,ro \ + --label-file={{ livekit_server_base_path }}/labels \ + {{ livekit_server_image }} \ --dev --config /etc/livekit.yaml ExecStart={{ devture_systemd_docker_base_host_command_docker }} start --attach matrix-livekit-server @@ -31,4 +31,4 @@ RestartSec=30 SyslogIdentifier=matrix-livekit-server [Install] -WantedBy=multi-user.target \ No newline at end of file +WantedBy=multi-user.target