| @@ -843,6 +843,13 @@ matrix_jitsi_web_stun_servers: | | |||||
| else [ 'stun:meet-jit-si-turnrelay.jitsi.net:443'] | else [ 'stun:meet-jit-si-turnrelay.jitsi.net:443'] | ||||
| }} | }} | ||||
| # If the self-hosted Etherpad instance is available, it will also show up in Jitsi conferences, | |||||
| # unless explicitly disabled by setting `matrix_jitsi_etherpad_enabled` to false. | |||||
| # Falls back to the scalar.vector.im etherpad in case someone sets `matrix_jitsi_etherpad_enabled` to true, | |||||
| # while also setting `matrix_etherpad_enabled` to false. | |||||
| matrix_jitsi_etherpad_enabled: "{{ matrix_etherpad_enabled }}" | |||||
| matrix_jitsi_etherpad_base: "{{ matrix_etherpad_base_url if matrix_etherpad_enabled else 'https://scalar.vector.im/etherpad' }}" | |||||
| ###################################################################### | ###################################################################### | ||||
| # | # | ||||
| # /matrix-jitsi | # /matrix-jitsi | ||||
| @@ -67,6 +67,9 @@ matrix_jitsi_web_public_url: "https://{{ matrix_server_fqn_jitsi }}" | |||||
| # Addresses need to be prefixed with one of `stun:`, `turn:` or `turns:`. | # Addresses need to be prefixed with one of `stun:`, `turn:` or `turns:`. | ||||
| matrix_jitsi_web_stun_servers: ['stun:meet-jit-si-turnrelay.jitsi.net:443'] | matrix_jitsi_web_stun_servers: ['stun:meet-jit-si-turnrelay.jitsi.net:443'] | ||||
| # Controls whether Etherpad will be available within Jitsi | |||||
| matrix_jitsi_etherpad_enabled: false | |||||
| # Controls whether the matrix-jitsi-web container exposes its HTTP port (tcp/80 in the container). | # Controls whether the matrix-jitsi-web container exposes its HTTP port (tcp/80 in the container). | ||||
| # | # | ||||
| # Takes an "<ip>:<port>" or "<port>" value (e.g. "127.0.0.1:12080"), or empty string to not expose. | # Takes an "<ip>:<port>" or "<port>" value (e.g. "127.0.0.1:12080"), or empty string to not expose. | ||||
| @@ -11,5 +11,8 @@ config.p2p.stunServers = [ | |||||
| ]; | ]; | ||||
| {% endif %} | {% endif %} | ||||
| {% if matrix_jitsi_etherpad_enabled %} | |||||
| config.etherpad_base = {{ (matrix_jitsi_etherpad_base + '/p/') |to_json }} | |||||
| {% endif %} | |||||
| {{ matrix_jitsi_web_custom_config_extension }} | {{ matrix_jitsi_web_custom_config_extension }} | ||||
| @@ -37,4 +37,6 @@ RESOLUTION_WIDTH_MIN={{ matrix_jitsi_web_config_resolution_width_min }} | |||||
| START_AUDIO_MUTED={{ matrix_jitsi_web_config_start_audio_muted_after_nth_participant }} | START_AUDIO_MUTED={{ matrix_jitsi_web_config_start_audio_muted_after_nth_participant }} | ||||
| START_VIDEO_MUTED={{ matrix_jitsi_web_config_start_video_muted_after_nth_participant }} | START_VIDEO_MUTED={{ matrix_jitsi_web_config_start_video_muted_after_nth_participant }} | ||||
| ETHERPAD_URL_BASE={{ (matrix_jitsi_etherpad_base + '/') if matrix_jitsi_etherpad_enabled else ''}} | |||||
| {{ matrix_jitsi_web_environment_variables_extension }} | {{ matrix_jitsi_web_environment_variables_extension }} | ||||