From 03da7b06ef55e76e46727cc8477d9e557b3f8f65 Mon Sep 17 00:00:00 2001
From: Sam Al-Sapti <sam@sapti.me>
Date: Wed, 15 May 2024 21:24:30 +0200
Subject: [PATCH] Fix Jitsi Meet

---
 group_vars/all/vars.yml                         | 3 +++
 roles/apps/templates/compose-files/jitsi.yml.j2 | 6 ++++--
 roles/apps/templates/nginx/conf.d/jitsi.conf.j2 | 2 +-
 roles/virt-common/tasks/firewall.yml            | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml
index e4e4ba9..08ba94a 100644
--- a/group_vars/all/vars.yml
+++ b/group_vars/all/vars.yml
@@ -4,6 +4,9 @@
 hostname: "{{ inventory_hostname }}"
 timezone: Europe/Copenhagen
 
+home_ipv4: 46.32.144.131
+home_ipv6: 2a06:4001:f02a::/48
+
 users:
   - name: lab_admin
     comment: System administrator
diff --git a/roles/apps/templates/compose-files/jitsi.yml.j2 b/roles/apps/templates/compose-files/jitsi.yml.j2
index 4fa42e4..31d570e 100644
--- a/roles/apps/templates/compose-files/jitsi.yml.j2
+++ b/roles/apps/templates/compose-files/jitsi.yml.j2
@@ -59,8 +59,10 @@ services:
     restart: always
     environment:
       JVB_AUTH_PASSWORD: {{ jitsi_passwords.jvb_auth }}
-      JVB_WS_DOMAIN: {{ apps_vars.jitsi.domain }}
-{% if hostname not in groups['production'] %}
+      PUBLIC_URL: {{ apps_vars.jitsi.domain }}
+{% if hostname in groups['production'] %}
+      JVB_ADVERTISE_IPS: {{ home_ipv4 }},{{ ansible_default_ipv6.address }}
+{% else %}
       JVB_ADVERTISE_IPS: {{ ansible_host }}
 {% endif %}
     networks:
diff --git a/roles/apps/templates/nginx/conf.d/jitsi.conf.j2 b/roles/apps/templates/nginx/conf.d/jitsi.conf.j2
index ba9bc12..39c41b0 100644
--- a/roles/apps/templates/nginx/conf.d/jitsi.conf.j2
+++ b/roles/apps/templates/nginx/conf.d/jitsi.conf.j2
@@ -19,7 +19,7 @@ server {
         proxy_set_header X-Forwarded-Proto "https";
     }
 
-    location ~^/(colibri-ws|xmpp-websocket)$ {
+    location ~^/(colibri-ws|xmpp-websocket) {
         proxy_pass $upstream;
 
         proxy_set_header Host              $host;
diff --git a/roles/virt-common/tasks/firewall.yml b/roles/virt-common/tasks/firewall.yml
index ced0c6e..6515558 100644
--- a/roles/virt-common/tasks/firewall.yml
+++ b/roles/virt-common/tasks/firewall.yml
@@ -19,8 +19,8 @@
         permanent: true
         state: enabled
       loop:
-        - '46.32.144.131'
-        - '2a06:4001:f02a::/48'
+        - "{{ home_ipv4 }}"
+        - "{{ home_ipv6 }}"
       when: instance_type == 'vps'
 
     - name: Move internal network to zone 'internal'