separated livekit and jwt to separate roles

2025-06-25 10:47:51 +02:00 · 2024-09-30 22:20:46 +10:00
parent b907777ae5
commit 8cb3e33bbf
29 changed files with 634 additions and 366 deletions
--- a/roles/custom/matrix-element-call/templates/config.json.j2
+++ b/roles/custom/matrix-element-call/templates/config.json.j2
@ -6,6 +6,6 @@
    }
  },
  "livekit": {
-    "livekit_service_url": "{{ matrix_element_call_livekit_service_url }}"
+    "livekit_service_url": "{{ matrix_jwt_service_url }}"
  }
 }
--- a/roles/custom/matrix-element-call/templates/env.j2
+++ b/roles/custom/matrix-element-call/templates/env.j2
@ -1,11 +0,0 @@
-# Environment variables for Element Call
-ELEMENT_CALL_SERVER_URL=https://{{ matrix_element_call_domain }}
-LIVEKIT_KEY=devkey
-LIVEKIT_URL={{ matrix_element_call_livekit_service_url }}
-LIVEKIT_SECRET={{ matrix_element_call_jwt_secret }}
-JWT_SERVICE_URL={{ matrix_element_call_jwt_service_url }}
-
-# Optional additional environment variables provided by the user
-{% for key, value in matrix_element_call_environment_variables_additional.items() %}
-{{ key }}={{ value }}
-{% endfor %}
--- a/roles/custom/matrix-element-call/templates/jwt-service-labels.j2
+++ b/roles/custom/matrix-element-call/templates/jwt-service-labels.j2
@ -1,13 +0,0 @@
-{% if matrix_element_call_container_labels_traefik_enabled %}
-traefik.enable=true
-
-{% if matrix_element_call_container_labels_traefik_docker_network %}
-traefik.docker.network={{ matrix_element_call_container_labels_traefik_docker_network }}
-{% endif %}
-
-# Define the Traefik router rule for JWT Service
-traefik.http.routers.jwt-router.rule=Host(`{{ matrix_element_call_jwt_hostname }}`)
-traefik.http.routers.jwt-router.entrypoints={{ matrix_element_call_container_labels_traefik_entrypoints }}
-traefik.http.routers.jwt-router.tls.certresolver={{ matrix_element_call_container_labels_traefik_tls_certResolver }}
-traefik.http.services.jwt-service.loadbalancer.server.port=8881
-{% endif %}
--- a/roles/custom/matrix-element-call/templates/livekit-labels.j2
+++ b/roles/custom/matrix-element-call/templates/livekit-labels.j2
@ -1,13 +0,0 @@
-{% if matrix_element_call_container_labels_traefik_enabled %}
-traefik.enable=true
-
-{% if matrix_element_call_container_labels_traefik_docker_network %}
-traefik.docker.network={{ matrix_element_call_container_labels_traefik_docker_network }}
-{% endif %}
-
-# Define the Traefik router rule for LiveKit
-traefik.http.routers.livekit-router.rule=Host(`{{ matrix_element_call_livekit_hostname }}`)
-traefik.http.routers.livekit-router.entrypoints={{ matrix_element_call_container_labels_traefik_entrypoints }}
-traefik.http.routers.livekit-router.tls.certresolver={{ matrix_element_call_container_labels_traefik_tls_certResolver }}
-traefik.http.services.livekit-service.loadbalancer.server.port=7880
-{% endif %}
--- a/roles/custom/matrix-element-call/templates/livekit.yaml.j2
+++ b/roles/custom/matrix-element-call/templates/livekit.yaml.j2
@ -1,20 +0,0 @@
-port: 7880
-bind_addresses:
-  - "0.0.0.0"
-rtc:
-  tcp_port: 7881
-  port_range_start: 50100
-  port_range_end: 50200
-  use_external_ip: false
-
-turn:
-  enabled: false
-  domain: localhost
-  cert_file: ""
-  key_file: ""
-  tls_port: 5349
-  udp_port: 443
-  external_tls: true
-
-keys:
-  devkey: "{{ matrix_element_call_livekit_dev_key }}"
--- a/roles/custom/matrix-element-call/templates/systemd/matrix-jwt-service.service.j2
+++ b/roles/custom/matrix-element-call/templates/systemd/matrix-jwt-service.service.j2
@ -1,37 +0,0 @@
-[Unit]
-Description=Matrix JWT Service
-After=docker.service
-Requires=docker.service
-
-[Service]
-Type=simple
-Environment="HOME={{ devture_systemd_docker_base_systemd_unit_home_path }}"
-ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} stop --time={{ devture_systemd_docker_base_container_stop_grace_time_seconds }} matrix-jwt-service 2>/dev/null || true'
-ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-jwt-service 2>/dev/null || true'
-
-ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
-    --rm \
-    --name=matrix-jwt-service \
-    --log-driver=none \
-    --user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
-    --cap-drop=ALL \
-    --network={{ matrix_element_call_container_network }} \
-    -p {{ matrix_jwt_service_port }}:8080 \
-    --env-file={{ matrix_element_call_base_path }}/config/env \
-    --label-file={{ matrix_element_call_base_path }}/config/jwt-service-labels \
-    {{ matrix_jwt_service_image }}
-
-{% for network in matrix_element_call_container_additional_networks %}
-ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-jwt-service
-{% endfor %}
-
-ExecStart={{ devture_systemd_docker_base_host_command_docker }} start --attach matrix-jwt-service
-
-ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} stop --time={{ devture_systemd_docker_base_container_stop_grace_time_seconds }} matrix-jwt-service 2>/dev/null || true'
-ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-jwt-service 2>/dev/null || true'
-Restart=always
-RestartSec=30
-SyslogIdentifier=matrix-jwt-service
-
-[Install]
-WantedBy=multi-user.target
--- a/roles/custom/matrix-element-call/templates/systemd/matrix-livekit.service.j2
+++ b/roles/custom/matrix-element-call/templates/systemd/matrix-livekit.service.j2
@ -1,33 +0,0 @@
-[Unit]
-Description=Matrix LiveKit Service
-After=docker.service
-Requires=docker.service
-
-[Service]
-Type=simple
-Environment="HOME={{ devture_systemd_docker_base_systemd_unit_home_path }}"
-ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} stop --time={{ devture_systemd_docker_base_container_stop_grace_time_seconds }} matrix-livekit 2>/dev/null || true'
-ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-livekit 2>/dev/null || true'
-
-ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
-    --rm \
-    --name=matrix-livekit \
-    --log-driver=none \
-    --user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
-    --cap-drop=ALL \
-    --network=host \
-    --mount type=bind,src={{ matrix_element_call_backend_path }}/livekit.yaml,dst=/etc/livekit.yaml,ro \
-	--label-file={{ matrix_element_call_base_path }}/config/livekit-labels \
-    {{ matrix_livekit_image }} \
-    --dev --config /etc/livekit.yaml
-
-ExecStart={{ devture_systemd_docker_base_host_command_docker }} start --attach matrix-livekit
-
-ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} stop --time={{ devture_systemd_docker_base_container_stop_grace_time_seconds }} matrix-livekit 2>/dev/null || true'
-ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-livekit 2>/dev/null || true'
-Restart=always
-RestartSec=30
-SyslogIdentifier=matrix-livekit
-
-[Install]
-WantedBy=multi-user.target