From ba511c4d1c166520e7a4070ce2b93629fa14644b Mon Sep 17 00:00:00 2001
From: Tony Breeds <tony@bakeyournoodle.com>
Date: Sat, 13 Jan 2024 08:55:20 +1100
Subject: [PATCH] Allow overriding of meetpad PUBLIC_URL

In testing jammy updates we discovered that this value need to match
so that websockets are directed to the correct host.

Change-Id: Id44bf92edff411389f05a652dad2ae78607e4d55
---
 inventory/service/group_vars/jvb.yaml               | 2 +-
 playbooks/roles/jitsi-meet/defaults/main.yaml       | 1 +
 playbooks/roles/jitsi-meet/templates/jvb-env.j2     | 2 +-
 playbooks/roles/jitsi-meet/templates/meet-env.j2    | 2 +-
 playbooks/zuul/templates/group_vars/jvb.yaml.j2     | 1 +
 playbooks/zuul/templates/group_vars/meetpad.yaml.j2 | 1 +
 6 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/inventory/service/group_vars/jvb.yaml b/inventory/service/group_vars/jvb.yaml
index 5f93162100..b51f08d9f6 100644
--- a/inventory/service/group_vars/jvb.yaml
+++ b/inventory/service/group_vars/jvb.yaml
@@ -1,5 +1,5 @@
-meetpad_jvb_xmpp_server: "{{ hostvars['meetpad01.opendev.org'].ansible_host }}"
 iptables_extra_public_udp_ports:
   - 10000
 iptables_extra_allowed_groups:
   - {'protocol': 'tcp', 'port': '9090', 'group': 'meetpad'}
+meetpad_jvb_xmpp_server: "{{ hostvars['meetpad01.opendev.org'].ansible_host }}"
diff --git a/playbooks/roles/jitsi-meet/defaults/main.yaml b/playbooks/roles/jitsi-meet/defaults/main.yaml
index 5a0930507f..150a642254 100644
--- a/playbooks/roles/jitsi-meet/defaults/main.yaml
+++ b/playbooks/roles/jitsi-meet/defaults/main.yaml
@@ -1,2 +1,3 @@
 docker_compose_file: meet-docker-compose.yaml
 docker_compose_env_file: meet-env.j2
+jitsi_meet_public_url: https://meetpad.opendev.org
diff --git a/playbooks/roles/jitsi-meet/templates/jvb-env.j2 b/playbooks/roles/jitsi-meet/templates/jvb-env.j2
index 805ac127cc..3dc52471a3 100644
--- a/playbooks/roles/jitsi-meet/templates/jvb-env.j2
+++ b/playbooks/roles/jitsi-meet/templates/jvb-env.j2
@@ -5,7 +5,7 @@
 # any defaults from the example):
 CONFIG=/var/jitsi-meet
 DEFAULTS=/var/jitsi-meet/defaults
-PUBLIC_URL=https://meetpad.opendev.org
+PUBLIC_URL={{ jitsi_meet_public_url }}
 XMPP_SERVER={{ meetpad_jvb_xmpp_server }}
 XMPP_AUTH_DOMAIN=auth.localhost
 XMPP_INTERNAL_MUC_DOMAIN=internal-muc.localhost
diff --git a/playbooks/roles/jitsi-meet/templates/meet-env.j2 b/playbooks/roles/jitsi-meet/templates/meet-env.j2
index fa2b715998..af1b942936 100644
--- a/playbooks/roles/jitsi-meet/templates/meet-env.j2
+++ b/playbooks/roles/jitsi-meet/templates/meet-env.j2
@@ -5,7 +5,7 @@
 # any defaults from the example):
 CONFIG=/var/jitsi-meet
 DEFAULTS=/var/jitsi-meet/defaults
-PUBLIC_URL=https://meetpad.opendev.org
+PUBLIC_URL={{ jitsi_meet_public_url }}
 ETHERPAD_URL_BASE=https://etherpad.opendev.org
 ENABLE_XMPP_WEBSOCKET=0
 XMPP_DOMAIN=localhost
diff --git a/playbooks/zuul/templates/group_vars/jvb.yaml.j2 b/playbooks/zuul/templates/group_vars/jvb.yaml.j2
index 59a159cf48..bc023ab799 100644
--- a/playbooks/zuul/templates/group_vars/jvb.yaml.j2
+++ b/playbooks/zuul/templates/group_vars/jvb.yaml.j2
@@ -1,2 +1,3 @@
+jitsi_meet_public_url: https://meetpad01.opendev.org
 meetpad_jvb_auth_password: 8c64807830bcc7581821d3157899e3b0
 meetpad_jvb_keystore_password: ateeweegoLee3aig5eish8aeraetiG
diff --git a/playbooks/zuul/templates/group_vars/meetpad.yaml.j2 b/playbooks/zuul/templates/group_vars/meetpad.yaml.j2
index e427e8ce0e..c49a9697ba 100644
--- a/playbooks/zuul/templates/group_vars/meetpad.yaml.j2
+++ b/playbooks/zuul/templates/group_vars/meetpad.yaml.j2
@@ -1,3 +1,4 @@
+jitsi_meet_public_url: https://meetpad01.opendev.org
 meetpad_jvb_auth_password: 8c64807830bcc7581821d3157899e3b0
 meetpad_jvb_keystore_password: ateeweegoLee3aig5eish8aeraetiG
 meetpad_jicofo_component_secret: 3bcd6b4494d99de7ff7b64b931d394f6