From c53f616457f52ce65c28503b80c4a8b2c0c01cfa Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Mon, 18 Apr 2022 23:16:42 +0200
Subject: jitsi/meet: cleanup and fixes for jvb config

---
 roles/apps/jitsi/meet/templates/pod-spec.yml.j2 | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'roles/apps/jitsi/meet/templates/pod-spec.yml.j2')

diff --git a/roles/apps/jitsi/meet/templates/pod-spec.yml.j2 b/roles/apps/jitsi/meet/templates/pod-spec.yml.j2
index 4137cec4..c6fed105 100644
--- a/roles/apps/jitsi/meet/templates/pod-spec.yml.j2
+++ b/roles/apps/jitsi/meet/templates/pod-spec.yml.j2
@@ -183,19 +183,19 @@ containers:
 
   - name: TZ
     value: {{ jitsi_meet_timezone }}
-{% if jitsi_resolution is defined %}
+{% if jitsi_meet_resolution is defined %}
 
-{%   if 'default' in jitsi_resolution %}
+{%   if 'default' in jitsi_meet_resolution %}
   - name: RESOLUTION
-    value: "{{ jitsi_resolution.default.height }}"
+    value: "{{ jitsi_meet_resolution.default.height }}"
   - name: RESOLUTION_WIDTH
-    value: "{{ jitsi_resolution.default.width }}"
+    value: "{{ jitsi_meet_resolution.default.width }}"
 {%   endif %}
-{%   if 'min' in jitsi_resolution %}
+{%   if 'min' in jitsi_meet_resolution %}
   - name: RESOLUTION_MIN
-    value: "{{ jitsi_resolution.min.height }}"
+    value: "{{ jitsi_meet_resolution.min.height }}"
   - name: RESOLUTION_WIDTH_MIN
-    value: "{{ jitsi_resolution.min.width }}"
+    value: "{{ jitsi_meet_resolution.min.width }}"
 {%   endif %}
 {% endif %}
 
@@ -212,10 +212,12 @@ containers:
     hostPort: {{ jitsi_meet_jvb_port }}
     hostIP: "{{ external_ip | default(ansible_default_ipv4.address) }}"
   volumeMounts:
+{% if jitsi_meet_jvb_config_extra is defined %}
   - name: scripts
     subPath: jvb/cont-init.sh
     mountPath: /etc/cont-init.d/99-k8s
     readOnly: yes
+{% endif %}
   - name: config
     subPath: jvb
     mountPath: /config
@@ -244,6 +246,8 @@ containers:
     value: "true"
   - name: DOCKER_HOST_ADDRESS
     value: "{{ external_ip | default(ansible_default_ipv4.address) }}"
+  - name: JVB_WS_SERVER_ID
+    value: "127.0.0.1"
 
   - name: TZ
     value: {{ jitsi_meet_timezone }}
-- 
cgit v1.2.3