소스 검색

misc: all variables moved to .env file for fully customization of jitsi-meet service domains

netaskd 6 년 전
부모
커밋
fb93051bea
4개의 변경된 파일13개의 추가작업 그리고 5개의 파일을 삭제
  1. 2 0
      README.md
  2. 4 4
      docker-compose.yml
  3. 6 0
      env.example
  4. 1 1
      jigasi.yml

+ 2 - 0
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

+ 4 - 4
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

+ 6 - 0
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
 

+ 1 - 1
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