From be250aa801248ea2f23fccaa53c2a5275efd360a Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 1 Jan 2021 16:52:56 +0000 Subject: [PATCH] Fix jitsi config --- docker-compose.yml | 249 +++++++++++++++++++++++++++++++-------------- 1 file changed, 172 insertions(+), 77 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 37084ba..9b8b2aa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -137,37 +137,98 @@ services: image: jitsi/web:latest restart: always volumes: - - /opt/jitsi/web:/config:Z - - /opt/jitsi/transcripts:/usr/share/jitsi-meet/transcripts:Z + - ${CONFIG}/web:/config:Z + - ${CONFIG}/transcripts:/usr/share/jitsi-meet/transcripts:Z environment: - - ENABLE_LETSENCRYPT=false - - ENABLE_HTTP_REDIRECT=false - - ENABLE_HSTS=false - - ENABLE_XMPP_WEBSOCKET=true - - DISABLE_HTTPS=true - - PUBLIC_URL=https://comms.${DOMAIN} - - TZ=UTC - - ENABLE_AUDIO_PROCESSING=true - - ENABLE_AUTH=true - - ENABLE_GUESTS=true - - ENABLE_LIPSYNC=true - - ENABLE_PREJOIN_PAGE=true - - ENABLE_WELCOME_PAGE=true - - ENABLE_CLOSE_PAGE=true - - ENABLE_REQUIRE_DISPLAY_NAME=false - - ENABLE_TALK_WHILE_MUTED=true - - JICOFO_AUTH_USER=focus - - DISABLE_AUDIO_LEVELS=false - - ENABLE_NOISY_MIC_DETECTION=true - - XMPP_AUTH_DOMAIN=auth.meet.jitsi - - XMPP_BOSH_URL_BASE=http://xmpp.meet.jitsi:5280 - - XMPP_DOMAIN=meet.jitsi - - XMPP_GUEST_DOMAIN=guest.meet.jitsi - - XMPP_MUC_DOMAIN=muc.meet.jitsi - - XMPP_RECORDER_DOMAIN=recorder.meet.jitsi + - ENABLE_LETSENCRYPT + - ENABLE_HTTP_REDIRECT + - ENABLE_HSTS + - ENABLE_XMPP_WEBSOCKET + - DISABLE_HTTPS + - LETSENCRYPT_DOMAIN + - LETSENCRYPT_EMAIL + - LETSENCRYPT_USE_STAGING + - PUBLIC_URL + - TZ + - AMPLITUDE_ID + - ANALYTICS_SCRIPT_URLS + - ANALYTICS_WHITELISTED_EVENTS + - BRIDGE_CHANNEL + - BRANDING_DATA_URL + - CALLSTATS_CUSTOM_SCRIPT_URL + - CALLSTATS_ID + - CALLSTATS_SECRET + - CHROME_EXTENSION_BANNER_JSON + - CONFCODE_URL + - CONFIG_EXTERNAL_CONNECT + - DEPLOYMENTINFO_ENVIRONMENT + - DEPLOYMENTINFO_ENVIRONMENT_TYPE + - DEPLOYMENTINFO_USERREGION + - DIALIN_NUMBERS_URL + - DIALOUT_AUTH_URL + - DIALOUT_CODES_URL + - DROPBOX_APPKEY + - DROPBOX_REDIRECT_URI + - ENABLE_AUDIO_PROCESSING + - ENABLE_AUTH + - ENABLE_CALENDAR + - ENABLE_FILE_RECORDING_SERVICE + - ENABLE_FILE_RECORDING_SERVICE_SHARING + - ENABLE_GUESTS + - ENABLE_IPV6 + - ENABLE_LIPSYNC + - ENABLE_NO_AUDIO_DETECTION + - ENABLE_P2P + - ENABLE_PREJOIN_PAGE + - ENABLE_WELCOME_PAGE + - ENABLE_CLOSE_PAGE + - ENABLE_RECORDING + - ENABLE_REMB + - ENABLE_REQUIRE_DISPLAY_NAME + - ENABLE_SIMULCAST + - ENABLE_STATS_ID + - ENABLE_STEREO + - ENABLE_SUBDOMAINS + - ENABLE_TALK_WHILE_MUTED + - ENABLE_TCC + - ENABLE_TRANSCRIPTIONS + - ETHERPAD_PUBLIC_URL + - ETHERPAD_URL_BASE + - GOOGLE_ANALYTICS_ID + - GOOGLE_API_APP_CLIENT_ID + - INVITE_SERVICE_URL + - JICOFO_AUTH_USER + - MATOMO_ENDPOINT + - MATOMO_SITE_ID + - MICROSOFT_API_APP_CLIENT_ID + - NGINX_RESOLVER + - NGINX_WORKER_PROCESSES + - NGINX_WORKER_CONNECTIONS + - PEOPLE_SEARCH_URL + - RESOLUTION + - RESOLUTION_MIN + - RESOLUTION_WIDTH + - RESOLUTION_WIDTH_MIN + - START_AUDIO_ONLY + - START_AUDIO_MUTED + - DISABLE_AUDIO_LEVELS + - ENABLE_NOISY_MIC_DETECTION + - START_BITRATE + - START_VIDEO_MUTED + - TESTING_CAP_SCREENSHARE_BITRATE + - TESTING_OCTO_PROBABILITY + - XMPP_AUTH_DOMAIN + - XMPP_BOSH_URL_BASE + - XMPP_DOMAIN + - XMPP_GUEST_DOMAIN + - XMPP_MUC_DOMAIN + - XMPP_RECORDER_DOMAIN + - TOKEN_AUTH_URL networks: nginx: meet.jitsi: + aliases: + - ${XMPP_DOMAIN} # XMPP server prosody: @@ -178,58 +239,90 @@ services: - '5347' - '5280' volumes: - - /opt/jitsi/prosody/config:/config:Z - - /opt/jitsi/prosody/prosody-plugins-custom:/prosody-plugins-custom:Z + - ${CONFIG}/prosody/config:/config:Z + - ${CONFIG}/prosody/prosody-plugins-custom:/prosody-plugins-custom:Z environment: - - AUTH_TYPE=internal - - ENABLE_AUTH=true - - ENABLE_GUESTS=true - - ENABLE_LOBBY=true - - ENABLE_XMPP_WEBSOCKET=true - - - XMPP_DOMAIN=meet.jitsi - - XMPP_AUTH_DOMAIN=auth.meet.jitsi - - XMPP_GUEST_DOMAIN=guest.meet.jitsi - - XMPP_MUC_DOMAIN=muc.meet.jitsi - - XMPP_INTERNAL_MUC_DOMAIN=internal-muc.meet.jitsi - - XMPP_RECORDER_DOMAIN=recorder.meet.jitsi + - AUTH_TYPE + - ENABLE_AUTH + - ENABLE_GUESTS + - ENABLE_LOBBY + - ENABLE_XMPP_WEBSOCKET + - GLOBAL_MODULES + - GLOBAL_CONFIG + - LDAP_URL + - LDAP_BASE + - LDAP_BINDDN + - LDAP_BINDPW + - LDAP_FILTER + - LDAP_AUTH_METHOD + - LDAP_VERSION + - LDAP_USE_TLS + - LDAP_TLS_CIPHERS + - LDAP_TLS_CHECK_PEER + - LDAP_TLS_CACERT_FILE + - LDAP_TLS_CACERT_DIR + - LDAP_START_TLS + - XMPP_DOMAIN + - XMPP_AUTH_DOMAIN + - XMPP_GUEST_DOMAIN + - XMPP_MUC_DOMAIN + - XMPP_INTERNAL_MUC_DOMAIN + - XMPP_MODULES + - XMPP_MUC_MODULES + - XMPP_INTERNAL_MUC_MODULES + - XMPP_RECORDER_DOMAIN + - XMPP_CROSS_DOMAIN - JICOFO_COMPONENT_SECRET - - JICOFO_AUTH_USER=focus + - JICOFO_AUTH_USER - JICOFO_AUTH_PASSWORD - - JVB_AUTH_USER=jvb + - JVB_AUTH_USER - JVB_AUTH_PASSWORD + - JIGASI_XMPP_USER - JIGASI_XMPP_PASSWORD + - JIBRI_XMPP_USER - JIBRI_XMPP_PASSWORD + - JIBRI_RECORDER_USER - JIBRI_RECORDER_PASSWORD - - PUBLIC_URL=https://comms.${DOMAIN} - - TZ=UTC + - JWT_APP_ID + - JWT_APP_SECRET + - JWT_ACCEPTED_ISSUERS + - JWT_ACCEPTED_AUDIENCES + - JWT_ASAP_KEYSERVER + - JWT_ALLOW_EMPTY + - JWT_AUTH_TYPE + - JWT_TOKEN_AUTH_MODULE + - LOG_LEVEL + - PUBLIC_URL + - TZ networks: meet.jitsi: aliases: - - xmpp.meet.jitsi + - ${XMPP_SERVER} # Focus component jicofo: image: jitsi/jicofo:latest restart: always volumes: - - /opt/jitsi/jicofo:/config:Z + - ${CONFIG}/jicofo:/config:Z environment: - - AUTH_TYPE=internal - - ENABLE_AUTH=true - - XMPP_DOMAIN=meet.jitsi - - XMPP_AUTH_DOMAIN=auth.meet.jitsi - - XMPP_INTERNAL_MUC_DOMAIN=internal-muc.meet.jitsi - - XMPP_MUC_DOMAIN=muc.meet.jitsi - - XMPP_SERVER=xmpp.meet.jitsi + - AUTH_TYPE + - ENABLE_AUTH + - XMPP_DOMAIN + - XMPP_AUTH_DOMAIN + - XMPP_INTERNAL_MUC_DOMAIN + - XMPP_MUC_DOMAIN + - XMPP_SERVER - JICOFO_COMPONENT_SECRET - - JICOFO_AUTH_USER=focus + - JICOFO_AUTH_USER - JICOFO_AUTH_PASSWORD - - JVB_BREWERY_MUC=jvbbrewery - - JIGASI_BREWERY_MUC=jigasibrewery - - JIBRI_BREWERY_MUC=jibribrewery - - JIBRI_PENDING_TIMEOUT=90 - - TZ=UTC + - JICOFO_RESERVATION_REST_BASE_URL + - JVB_BREWERY_MUC + - JIGASI_BREWERY_MUC + - JIGASI_SIP_URI + - JIBRI_BREWERY_MUC + - JIBRI_PENDING_TIMEOUT + - TZ depends_on: - prosody networks: @@ -240,26 +333,28 @@ services: image: jitsi/jvb:latest restart: always ports: - - '10000:10000/udp' - - '4443:4443' + - '${JVB_PORT}:${JVB_PORT}/udp' + - '${JVB_TCP_PORT}:${JVB_TCP_PORT}' volumes: - - /opt/jitsi/jvb:/config:Z + - ${CONFIG}/jvb:/config:Z environment: - - DOCKER_HOST_ADDRESS=${LOCAL_IP} - - XMPP_AUTH_DOMAIN=meet.jitsi - - XMPP_INTERNAL_MUC_DOMAIN=internal-muc.meet.jitsi - - XMPP_SERVER=xmpp.meet.jitsi - - JVB_AUTH_USER=jvb + - DOCKER_HOST_ADDRESS + - XMPP_AUTH_DOMAIN + - XMPP_INTERNAL_MUC_DOMAIN + - XMPP_SERVER + - JVB_AUTH_USER - JVB_AUTH_PASSWORD - - JVB_BREWERY_MUC=jvbbrewery - - JVB_PORT=10000 - - JVB_TCP_HARVESTER_DISABLED=true - - JVB_TCP_PORT=4443 - - JVB_TCP_MAPPED_PORT=4443 - - JVB_STUN_SERVERS=meet-jit-si-turnrelay.jitsi.net:443 - - JVB_ENABLE_APIS= - - PUBLIC_URL=https://comms.${DOMAIN} - - TZ=UTC + - JVB_BREWERY_MUC + - JVB_PORT + - JVB_TCP_HARVESTER_DISABLED + - JVB_TCP_PORT + - JVB_TCP_MAPPED_PORT + - JVB_STUN_SERVERS + - JVB_ENABLE_APIS + - JVB_WS_DOMAIN + - JVB_WS_SERVER_ID + - PUBLIC_URL + - TZ depends_on: - prosody networks: