From fb93051bea06346be13275b6f0120251537fbcb6 Mon Sep 17 00:00:00 2001
From: netaskd <netaskd@gmail.com>
Date: Thu, 14 Mar 2019 14:37:10 +0300
Subject: [PATCH] misc: all variables moved to .env file for fully
 customization of jitsi-meet service domains

---
 README.md          | 2 ++
 docker-compose.yml | 8 ++++----
 env.example        | 6 ++++++
 jigasi.yml         | 2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index b450654..b62f9d9 100644
--- a/README.md
+++ b/README.md
@@ -159,6 +159,8 @@ Variable | Description | Default value
 --- | --- | ---
 `XMPP_DOMAIN` | Internal XMPP domain | meet.jitsi
 `XMPP_AUTH_DOMAIN` | Internal XMPP domain for authenticated services | auth.meet.jitsi
+`XMPP_SERVER` | Internal XMPP server name xmpp.meet.jitsi | xmpp.meet.jitsi
+`XMPP_BOSH_URL_BASE` | Internal XMPP server URL for BOSH module | http://xmpp.meet.jitsi:5280
 `XMPP_MUC_DOMAIN` | XMPP domain for the MUC | muc.meet.jitsi
 `XMPP_INTERNAL_MUC_DOMAIN` | XMPP domain for the internal MUC | internal-muc.meet.jitsi
 `XMPP_GUEST_DOMAIN` | XMPP domain for unauthenticated users | guest.meet.jitsi
diff --git a/docker-compose.yml b/docker-compose.yml
index 7ed07ed..1483fa4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,7 +20,7 @@ services:
             - LETSENCRYPT_EMAIL
             - XMPP_DOMAIN
             - XMPP_AUTH_DOMAIN
-            - XMPP_BOSH_URL_BASE=http://xmpp.meet.jitsi:5280
+            - XMPP_BOSH_URL_BASE
             - XMPP_GUEST_DOMAIN
             - XMPP_MUC_DOMAIN
             - TZ
@@ -63,7 +63,7 @@ services:
         networks:
             meet.jitsi:
                 aliases:
-                    - xmpp.meet.jitsi
+                    - ${XMPP_SERVER}
 
     # Focus component
     jicofo:
@@ -75,7 +75,7 @@ services:
             - XMPP_DOMAIN
             - XMPP_AUTH_DOMAIN
             - XMPP_INTERNAL_MUC_DOMAIN
-            - XMPP_SERVER=xmpp.meet.jitsi
+            - XMPP_SERVER
             - JICOFO_COMPONENT_SECRET
             - JICOFO_AUTH_USER
             - JICOFO_AUTH_PASSWORD
@@ -99,7 +99,7 @@ services:
             - DOCKER_HOST_ADDRESS
             - XMPP_AUTH_DOMAIN
             - XMPP_INTERNAL_MUC_DOMAIN
-            - XMPP_SERVER=xmpp.meet.jitsi
+            - XMPP_SERVER
             - JVB_AUTH_USER
             - JVB_AUTH_PASSWORD
             - JVB_BREWERY_MUC
diff --git a/env.example b/env.example
index 1a3ad53..726f771 100644
--- a/env.example
+++ b/env.example
@@ -84,6 +84,12 @@ TZ=Europe/Amsterdam
 # Internal XMPP domain.
 XMPP_DOMAIN=meet.jitsi
 
+# Internal XMPP server
+XMPP_SERVER=xmpp.meet.jitsi
+
+# Internal XMPP server URL
+XMPP_BOSH_URL_BASE=http://xmpp.meet.jitsi:5280
+
 # Internal XMPP domain for authenticated services.
 XMPP_AUTH_DOMAIN=auth.meet.jitsi
 
diff --git a/jigasi.yml b/jigasi.yml
index abdd7a8..c320651 100644
--- a/jigasi.yml
+++ b/jigasi.yml
@@ -12,7 +12,7 @@ services:
             - ENABLE_AUTH
             - XMPP_AUTH_DOMAIN
             - XMPP_INTERNAL_MUC_DOMAIN
-            - XMPP_SERVER=xmpp.meet.jitsi
+            - XMPP_SERVER
             - XMPP_DOMAIN
             - JIGASI_SIP_URI
             - JIGASI_SIP_PASSWORD