Merge "Pass PUBLIC_URL to jitsi-meet jvb containers"

5 months ago · 17eba9db32
parent 2e441e771f 080ff3954f
commit 17eba9db32
3 changed files with 3 additions and 0 deletions
--- a/playbooks/roles/jitsi-meet/files/jitsi-meet-docker/jvb-docker-compose.yaml
+++ b/playbooks/roles/jitsi-meet/files/jitsi-meet-docker/jvb-docker-compose.yaml
@ -13,6 +13,7 @@ services:
            - ${CONFIG}/jvb:/config
        environment:
            - DOCKER_HOST_ADDRESS
+            - PUBLIC_URL
            - XMPP_AUTH_DOMAIN
            - XMPP_INTERNAL_MUC_DOMAIN
            - XMPP_SERVER
--- a/playbooks/roles/jitsi-meet/files/jitsi-meet-docker/meet-docker-compose.yaml
+++ b/playbooks/roles/jitsi-meet/files/jitsi-meet-docker/meet-docker-compose.yaml
@ -138,6 +138,7 @@ services:
            - ${CONFIG}/jvb:/config
        environment:
            - DOCKER_HOST_ADDRESS
+            - PUBLIC_URL
            - XMPP_AUTH_DOMAIN
            - XMPP_INTERNAL_MUC_DOMAIN
            - XMPP_SERVER
--- a/playbooks/roles/jitsi-meet/templates/jvb-env.j2
+++ b/playbooks/roles/jitsi-meet/templates/jvb-env.j2
@ -4,6 +4,7 @@
 # Customized for OpenDev, all overrides go here (and remember to comment out
 # any defaults from the example):
 CONFIG=/var/jitsi-meet
+PUBLIC_URL=https://meetpad.opendev.org
 XMPP_SERVER={{ meetpad_jvb_xmpp_server }}
 XMPP_AUTH_DOMAIN=auth.localhost
 XMPP_INTERNAL_MUC_DOMAIN=internal-muc.localhost