diff --git a/docker-compose.yml b/docker-compose.yml index 74c7271..b184ae1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -99,7 +99,6 @@ services: - HIDE_PREJOIN_DISPLAY_NAME - HIDE_PREJOIN_EXTRA_BUTTONS - INVITE_SERVICE_URL - - JICOFO_AUTH_USER - LETSENCRYPT_DOMAIN - LETSENCRYPT_EMAIL - LETSENCRYPT_USE_STAGING @@ -191,7 +190,6 @@ services: - JIBRI_RECORDER_PASSWORD - JIBRI_XMPP_USER - JIBRI_XMPP_PASSWORD - - JICOFO_AUTH_USER - JICOFO_AUTH_PASSWORD - JICOFO_COMPONENT_SECRET - JIGASI_XMPP_USER @@ -271,7 +269,6 @@ services: - ENABLE_RECORDING - ENABLE_SCTP - ENABLE_AUTO_LOGIN - - JICOFO_AUTH_USER - JICOFO_AUTH_PASSWORD - JICOFO_ENABLE_BRIDGE_HEALTH_CHECKS - JICOFO_CONF_INITIAL_PARTICIPANT_WAIT_TIMEOUT diff --git a/jicofo/rootfs/defaults/jicofo.conf b/jicofo/rootfs/defaults/jicofo.conf index 226ec8f..f0feea5 100644 --- a/jicofo/rootfs/defaults/jicofo.conf +++ b/jicofo/rootfs/defaults/jicofo.conf @@ -4,7 +4,6 @@ {{ $ENABLE_RECORDING := .Env.ENABLE_RECORDING | default "0" | toBool }} {{ $ENABLE_OCTO := .Env.ENABLE_OCTO | default "0" | toBool }} {{ $ENABLE_AUTO_LOGIN := .Env.ENABLE_AUTO_LOGIN | default "1" | toBool }} -{{ $JICOFO_AUTH_USER := .Env.JICOFO_AUTH_USER | default "focus" -}} {{ $JIBRI_BREWERY_MUC := .Env.JIBRI_BREWERY_MUC | default "jibribrewery" -}} {{ $JIGASI_BREWERY_MUC := .Env.JIGASI_BREWERY_MUC | default "jigasibrewery" -}} {{ $JVB_BREWERY_MUC := .Env.JVB_BREWERY_MUC | default "jvbbrewery" -}} @@ -145,7 +144,7 @@ jicofo { port = "{{ $XMPP_PORT }}" domain = "{{ $XMPP_AUTH_DOMAIN }}" xmpp-domain = "{{ $XMPP_DOMAIN }}" - username = "{{ $JICOFO_AUTH_USER }}" + username = "focus" password = "{{ .Env.JICOFO_AUTH_PASSWORD }}" conference-muc-jid = "{{ $XMPP_MUC_DOMAIN }}" client-proxy = "focus.{{ $XMPP_DOMAIN }}" diff --git a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua index 97fc6a2..fb0b8d9 100644 --- a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua +++ b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua @@ -3,7 +3,6 @@ {{ $ENABLE_RECORDING := .Env.ENABLE_RECORDING | default "0" | toBool }} {{ $AUTH_TYPE := .Env.AUTH_TYPE | default "internal" }} {{ $JIBRI_XMPP_USER := .Env.JIBRI_XMPP_USER | default "jibri" -}} -{{ $JICOFO_AUTH_USER := .Env.JICOFO_AUTH_USER | default "focus" -}} {{ $JIGASI_XMPP_USER := .Env.JIGASI_XMPP_USER | default "jigasi" -}} {{ $JVB_AUTH_USER := .Env.JVB_AUTH_USER | default "jvb" -}} {{ $JWT_ASAP_KEYSERVER := .Env.JWT_ASAP_KEYSERVER | default "" }} @@ -47,12 +46,12 @@ admins = { "{{ $JIBRI_XMPP_USER }}@{{ $XMPP_AUTH_DOMAIN }}", {{ end }} - "{{ $JICOFO_AUTH_USER }}@{{ $XMPP_AUTH_DOMAIN }}", + "focus@{{ $XMPP_AUTH_DOMAIN }}", "{{ $JVB_AUTH_USER }}@{{ $XMPP_AUTH_DOMAIN }}" } unlimited_jids = { - "{{ $JICOFO_AUTH_USER }}@{{ $XMPP_AUTH_DOMAIN }}", + "focus@{{ $XMPP_AUTH_DOMAIN }}", "{{ $JVB_AUTH_USER }}@{{ $XMPP_AUTH_DOMAIN }}" } @@ -280,12 +279,12 @@ Component "{{ $XMPP_MUC_DOMAIN }}" "muc" {{ join "\n" (splitList "," .Env.XMPP_MUC_CONFIGURATION) }} {{ end -}} {{ if .Env.MAX_PARTICIPANTS }} - muc_access_whitelist = { "{{ .Env.JICOFO_AUTH_USER }}@{{ .Env.XMPP_AUTH_DOMAIN }}" } + muc_access_whitelist = { "focus@{{ .Env.XMPP_AUTH_DOMAIN }}" } muc_max_occupants = "{{ .Env.MAX_PARTICIPANTS }}" {{ end }} Component "focus.{{ $XMPP_DOMAIN }}" "client_proxy" - target_address = "{{ $JICOFO_AUTH_USER }}@{{ $XMPP_AUTH_DOMAIN }}" + target_address = "focus@{{ $XMPP_AUTH_DOMAIN }}" Component "speakerstats.{{ $XMPP_DOMAIN }}" "speakerstats_component" muc_component = "{{ $XMPP_MUC_DOMAIN }}" diff --git a/prosody/rootfs/etc/cont-init.d/10-config b/prosody/rootfs/etc/cont-init.d/10-config index 10dfe0c..4841717 100644 --- a/prosody/rootfs/etc/cont-init.d/10-config +++ b/prosody/rootfs/etc/cont-init.d/10-config @@ -38,15 +38,14 @@ fi # Defaults [ -z "${JIBRI_RECORDER_USER}" ] && export JIBRI_RECORDER_USER=recorder [ -z "${JIBRI_XMPP_USER}" ] && export JIBRI_XMPP_USER=jibri -[ -z "${JICOFO_AUTH_USER}" ] && export JICOFO_AUTH_USER=focus [ -z "${JIGASI_XMPP_USER}" ] && export JIGASI_XMPP_USER=jigasi [ -z "${JVB_AUTH_USER}" ] && export JVB_AUTH_USER=jvb [ -z "${XMPP_DOMAIN}" ] && export XMPP_DOMAIN=meet.jitsi [ -z "${XMPP_AUTH_DOMAIN}" ] && export XMPP_AUTH_DOMAIN=auth.meet.jitsi [ -z "${XMPP_RECORDER_DOMAIN}" ] && export XMPP_RECORDER_DOMAIN=recorder.meet.jitsi -prosodyctl --config $PROSODY_CFG register $JICOFO_AUTH_USER $XMPP_AUTH_DOMAIN $JICOFO_AUTH_PASSWORD -prosodyctl --config $PROSODY_CFG mod_roster_command subscribe focus.$XMPP_DOMAIN $JICOFO_AUTH_USER@$XMPP_AUTH_DOMAIN +prosodyctl --config $PROSODY_CFG register focus $XMPP_AUTH_DOMAIN $JICOFO_AUTH_PASSWORD +prosodyctl --config $PROSODY_CFG mod_roster_command subscribe focus.$XMPP_DOMAIN focus@$XMPP_AUTH_DOMAIN if [[ -z $JVB_AUTH_PASSWORD ]]; then echo 'FATAL ERROR: JVB auth password must be set' diff --git a/web/rootfs/defaults/system-config.js b/web/rootfs/defaults/system-config.js index d907b88..16deab7 100644 --- a/web/rootfs/defaults/system-config.js +++ b/web/rootfs/defaults/system-config.js @@ -3,7 +3,6 @@ {{ $ENABLE_GUESTS := .Env.ENABLE_GUESTS | default "false" | toBool -}} {{ $ENABLE_SUBDOMAINS := .Env.ENABLE_SUBDOMAINS | default "true" | toBool -}} {{ $ENABLE_XMPP_WEBSOCKET := .Env.ENABLE_XMPP_WEBSOCKET | default "1" | toBool -}} -{{ $JICOFO_AUTH_USER := .Env.JICOFO_AUTH_USER | default "focus" -}} {{ $PUBLIC_URL_DOMAIN := .Env.PUBLIC_URL | default "https://localhost:8443" | trimPrefix "https://" | trimSuffix "/" -}} {{ $XMPP_AUTH_DOMAIN := .Env.XMPP_AUTH_DOMAIN | default "auth.meet.jitsi" -}} {{ $XMPP_DOMAIN := .Env.XMPP_DOMAIN | default "meet.jitsi" -}} @@ -17,7 +16,7 @@ var config = {}; if (!config.hasOwnProperty('hosts')) config.hosts = {}; config.hosts.domain = '{{ $XMPP_DOMAIN }}'; -config.focusUserJid = '{{$JICOFO_AUTH_USER}}@{{$XMPP_AUTH_DOMAIN}}'; +config.focusUserJid = 'focus@{{$XMPP_AUTH_DOMAIN}}'; {{ if $ENABLE_SUBDOMAINS -}} var subdir = '';