From 13ce96eadcfa6436b4d96fba42b824c8ff5c2675 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Fri, 12 Feb 2021 22:38:42 +0100
Subject: upgrade jitsi meet

---
 inventory/host_vars/sk-cloudio/jitsi.yml        | 5 ++---
 roles/apps/jitsi/meet/defaults/main.yml         | 5 ++---
 roles/apps/jitsi/meet/tasks/main.yml            | 3 ++-
 roles/apps/jitsi/meet/templates/pod-spec.yml.j2 | 6 ++++++
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/inventory/host_vars/sk-cloudio/jitsi.yml b/inventory/host_vars/sk-cloudio/jitsi.yml
index 96d2b1b5..0a20fc79 100644
--- a/inventory/host_vars/sk-cloudio/jitsi.yml
+++ b/inventory/host_vars/sk-cloudio/jitsi.yml
@@ -1,8 +1,7 @@
 ---
 jitsi_meet_base_path: /srv/storage/jitsi/meet
 
-jitsi_meet_version: stable-5142
-jitsi_meet_hostnames:
-  - meet.elev8.at
+jitsi_meet_version: stable-5390-3
+jitsi_meet_hostname: meet.elev8.at
 
 jitsi_meet_secrets: "{{ vault_jitsi_meet_secrets }}"
diff --git a/roles/apps/jitsi/meet/defaults/main.yml b/roles/apps/jitsi/meet/defaults/main.yml
index f86582a5..100abe89 100644
--- a/roles/apps/jitsi/meet/defaults/main.yml
+++ b/roles/apps/jitsi/meet/defaults/main.yml
@@ -2,9 +2,8 @@
 jitsi_meet_base_path: /srv/jitsi/meet
 
 # jitsi_meet_version: 4101-2
-jitsi_meet_inst_name: "{{ jitsi_meet_hostnames[0] }}"
-# jitsi_meet_hostnames:
-#   - meet.example.com
+jitsi_meet_inst_name: "{{ jitsi_meet_hostname }}"
+# jitsi_meet_hostname: meet.example.com
 
 jitsi_meet_http_port: 8400
 jitsi_meet_jvb_port: 10000
diff --git a/roles/apps/jitsi/meet/tasks/main.yml b/roles/apps/jitsi/meet/tasks/main.yml
index 16e05ced..f85fd572 100644
--- a/roles/apps/jitsi/meet/tasks/main.yml
+++ b/roles/apps/jitsi/meet/tasks/main.yml
@@ -38,7 +38,8 @@
       name: "jitsi-meet-{{ jitsi_meet_inst_name }}"
       template: generic-proxy-no-buffering-with-acme
       acme: true
-      hostnames: "{{ jitsi_meet_hostnames }}"
+      hostnames:
+      - "{{ jitsi_meet_hostname }}"
       client_max_body_size: "0"
       proxy_pass: "http://127.0.0.1:{{ jitsi_meet_http_port }}"
   include_role:
diff --git a/roles/apps/jitsi/meet/templates/pod-spec.yml.j2 b/roles/apps/jitsi/meet/templates/pod-spec.yml.j2
index a8abd011..fa00b17a 100644
--- a/roles/apps/jitsi/meet/templates/pod-spec.yml.j2
+++ b/roles/apps/jitsi/meet/templates/pod-spec.yml.j2
@@ -28,6 +28,8 @@ containers:
     value: meet.jitsi
   - name: XMPP_AUTH_DOMAIN
     value: auth.meet.jitsi
+  - name: XMPP_MUC_DOMAIN
+    value: muc.meet.jitsi
   - name: XMPP_INTERNAL_MUC_DOMAIN
     value: internal-muc.meet.jitsi
 
@@ -59,6 +61,8 @@ containers:
     subPath: prosody
     mountPath: /config
   env:
+  - name: PUBLIC_URL
+    value: "https://{{ jitsi_meet_hostname }}"
   - name: ENABLE_LOBBY
     value: "1"
 
@@ -105,6 +109,8 @@ containers:
     subPath: web
     mountPath: /config
   env:
+  - name: PUBLIC_URL
+    value: "https://{{ jitsi_meet_hostname }}"
   - name: DISABLE_HTTPS
     value: "1"
   - name: ENABLE_HTTP_REDIRECT
-- 
cgit v1.2.3