From fb6cb0c52db49dde3f7cc266466d4a2a18406989 Mon Sep 17 00:00:00 2001 From: Jan Beilicke Date: Sun, 13 Dec 2020 00:32:38 +0100 Subject: [PATCH] Sorted ENV vars --- templates/docker-compose.jitsi.yml.j2 | 128 +++++++++++++------------- 1 file changed, 64 insertions(+), 64 deletions(-) diff --git a/templates/docker-compose.jitsi.yml.j2 b/templates/docker-compose.jitsi.yml.j2 index 15b8fd6..f2d68ae 100644 --- a/templates/docker-compose.jitsi.yml.j2 +++ b/templates/docker-compose.jitsi.yml.j2 @@ -10,17 +10,11 @@ services: - ${CONFIG}/web/letsencrypt:/etc/letsencrypt - ${CONFIG}/transcripts:/usr/share/jitsi-meet/transcripts environment: - - ENABLE_LETSENCRYPT - - ENABLE_HTTP_REDIRECT - - ENABLE_XMPP_WEBSOCKET - - DISABLE_HTTPS - - PUBLIC_URL - - TZ - AMPLITUDE_ID - ANALYTICS_SCRIPT_URLS - ANALYTICS_WHITELISTED_EVENTS - - BRIDGE_CHANNEL - BRANDING_DATA_URL + - BRIDGE_CHANNEL - CALLSTATS_CUSTOM_SCRIPT_URL - CALLSTATS_ID - CALLSTATS_SECRET @@ -33,6 +27,7 @@ services: - DIALIN_NUMBERS_URL - DIALOUT_AUTH_URL - DIALOUT_CODES_URL + - DISABLE_HTTPS - DROPBOX_APPKEY - DROPBOX_REDIRECT_URI - ENABLE_AUDIO_PROCESSING @@ -41,7 +36,9 @@ services: - ENABLE_FILE_RECORDING_SERVICE - ENABLE_FILE_RECORDING_SERVICE_SHARING - ENABLE_GUESTS + - ENABLE_HTTP_REDIRECT - ENABLE_IPV6 + - ENABLE_LETSENCRYPT - ENABLE_LIPSYNC - ENABLE_NO_AUDIO_DETECTION - ENABLE_P2P @@ -56,6 +53,7 @@ services: - ENABLE_TALK_WHILE_MUTED - ENABLE_TCC - ENABLE_TRANSCRIPTIONS + - ENABLE_XMPP_WEBSOCKET - ETHERPAD_PUBLIC_URL - ETHERPAD_URL_BASE - GOOGLE_ANALYTICS_ID @@ -67,16 +65,18 @@ services: - MICROSOFT_API_APP_CLIENT_ID - NGINX_RESOLVER - PEOPLE_SEARCH_URL + - PUBLIC_URL - RESOLUTION - RESOLUTION_MIN - RESOLUTION_WIDTH - RESOLUTION_WIDTH_MIN - - START_AUDIO_ONLY - START_AUDIO_MUTED + - START_AUDIO_ONLY - START_BITRATE - START_VIDEO_MUTED - TESTING_CAP_SCREENSHARE_BITRATE - TESTING_OCTO_PROBABILITY + - TZ - XMPP_AUTH_DOMAIN - XMPP_BOSH_URL_BASE - XMPP_DOMAIN @@ -122,52 +122,52 @@ services: - ENABLE_GUESTS - ENABLE_LOBBY - ENABLE_XMPP_WEBSOCKET - - GLOBAL_MODULES - GLOBAL_CONFIG - - LDAP_URL + - GLOBAL_MODULES + - JIBRI_RECORDER_PASSWORD + - JIBRI_RECORDER_USER + - JIBRI_XMPP_PASSWORD + - JIBRI_XMPP_USER + - JICOFO_AUTH_PASSWORD + - JICOFO_AUTH_USER + - JICOFO_COMPONENT_SECRET + - JIGASI_XMPP_PASSWORD + - JIGASI_XMPP_USER + - JVB_AUTH_PASSWORD + - JVB_AUTH_USER + - JWT_ACCEPTED_AUDIENCES + - JWT_ACCEPTED_ISSUERS + - JWT_ALLOW_EMPTY + - JWT_APP_ID + - JWT_APP_SECRET + - JWT_ASAP_KEYSERVER + - JWT_AUTH_TYPE + - JWT_TOKEN_AUTH_MODULE + - LDAP_AUTH_METHOD - 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 - - JICOFO_COMPONENT_SECRET - - JICOFO_AUTH_USER - - JICOFO_AUTH_PASSWORD - - JVB_AUTH_USER - - JVB_AUTH_PASSWORD - - JIGASI_XMPP_USER - - JIGASI_XMPP_PASSWORD - - JIBRI_XMPP_USER - - JIBRI_XMPP_PASSWORD - - JIBRI_RECORDER_USER - - JIBRI_RECORDER_PASSWORD - - 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 + - LDAP_TLS_CACERT_DIR + - LDAP_TLS_CACERT_FILE + - LDAP_TLS_CHECK_PEER + - LDAP_TLS_CIPHERS + - LDAP_URL + - LDAP_USE_TLS + - LDAP_VERSION - LOG_LEVEL - PUBLIC_URL - TZ + - XMPP_AUTH_DOMAIN + - XMPP_DOMAIN + - XMPP_GUEST_DOMAIN + - XMPP_INTERNAL_MUC_DOMAIN + - XMPP_INTERNAL_MUC_MODULES + - XMPP_MODULES + - XMPP_MUC_DOMAIN + - XMPP_MUC_MODULES + - XMPP_RECORDER_DOMAIN networks: meet.jitsi: aliases: @@ -181,19 +181,19 @@ services: - ${CONFIG}/jicofo:/config environment: - ENABLE_AUTH - - XMPP_DOMAIN - - XMPP_AUTH_DOMAIN - - XMPP_INTERNAL_MUC_DOMAIN - - XMPP_SERVER - - JICOFO_COMPONENT_SECRET - - JICOFO_AUTH_USER - - JICOFO_AUTH_PASSWORD - - JICOFO_RESERVATION_REST_BASE_URL - - JVB_BREWERY_MUC - - JIGASI_BREWERY_MUC - JIBRI_BREWERY_MUC - JIBRI_PENDING_TIMEOUT + - JICOFO_AUTH_PASSWORD + - JICOFO_AUTH_USER + - JICOFO_COMPONENT_SECRET + - JICOFO_RESERVATION_REST_BASE_URL + - JIGASI_BREWERY_MUC + - JVB_BREWERY_MUC - TZ + - XMPP_AUTH_DOMAIN + - XMPP_DOMAIN + - XMPP_INTERNAL_MUC_DOMAIN + - XMPP_SERVER depends_on: - prosody networks: @@ -210,22 +210,22 @@ services: - ${CONFIG}/jvb:/config environment: - DOCKER_HOST_ADDRESS - - XMPP_AUTH_DOMAIN - - XMPP_INTERNAL_MUC_DOMAIN - - XMPP_SERVER - - JVB_AUTH_USER - JVB_AUTH_PASSWORD + - JVB_AUTH_USER - JVB_BREWERY_MUC - - JVB_PORT - - JVB_TCP_HARVESTER_DISABLED - - JVB_TCP_PORT - - JVB_TCP_MAPPED_PORT - - JVB_STUN_SERVERS - JVB_ENABLE_APIS + - JVB_PORT + - JVB_STUN_SERVERS + - JVB_TCP_HARVESTER_DISABLED + - JVB_TCP_MAPPED_PORT + - JVB_TCP_PORT - JVB_WS_DOMAIN - JVB_WS_SERVER_ID - PUBLIC_URL - TZ + - XMPP_AUTH_DOMAIN + - XMPP_INTERNAL_MUC_DOMAIN + - XMPP_SERVER depends_on: - prosody networks: