5.2.1 #26

Merged
Ark74 merged 4 commits from unstable into master 2021-01-25 11:02:15 +00:00
2 changed files with 15 additions and 13 deletions
Showing only changes of commit 1e9cbb575b - Show all commits

View File

@ -63,20 +63,20 @@ REC-JIBRI
#Setup guests and lobby #Setup guests and lobby
cat << P_SR >> $PROSODY_FILE cat << P_SR >> $PROSODY_FILE
-- #Change back lobby - https://community.jitsi.org/t/64769/136
VirtualHost "guest.$DOMAIN" VirtualHost "guest.$DOMAIN"
authentication = "token" authentication = "token"
allow_empty_token = true allow_empty_token = true
c2s_require_encryption = false c2s_require_encryption = false
muc_lobby_whitelist = { "recorder.$DOMAIN", "auth.$DOMAIN" } -- muc_lobby_whitelist = { "recorder.$DOMAIN", "auth.$DOMAIN" }
speakerstats_component = "speakerstats.$DOMAIN" speakerstats_component = "speakerstats.$DOMAIN"
conference_duration_component = "conferenceduration.$DOMAIN" -- conference_duration_component = "conferenceduration.$DOMAIN"
app_id="$APP_ID"; app_id="$APP_ID";
app_secret="$SECRET_APP"; app_secret="$SECRET_APP";
modules_enabled = { modules_enabled = {
"speakerstats"; "speakerstats";
"conference_duration"; -- "conference_duration";
} }
P_SR P_SR

View File

@ -982,22 +982,23 @@ bash $PWD/mode/jwt.sh
fi fi
#Guest allow #Guest allow
#Change back lobby - https://community.jitsi.org/t/64769/136
if [ "$ENABLE_SC" = "yes" ];then if [ "$ENABLE_SC" = "yes" ];then
cat << P_SR >> $PROSODY_FILE cat << P_SR >> $PROSODY_FILE
-- #Change back lobby - https://community.jitsi.org/t/64769/136
VirtualHost "guest.$DOMAIN" VirtualHost "guest.$DOMAIN"
authentication = "anonymous" authentication = "anonymous"
c2s_require_encryption = false c2s_require_encryption = false
speakerstats_component = "speakerstats.$DOMAIN" speakerstats_component = "speakerstats.$DOMAIN"
conference_duration_component = "conferenceduration.$DOMAIN" -- conference_duration_component = "conferenceduration.$DOMAIN"
lobby_muc = "lobby.$DOMAIN" -- lobby_muc = "lobby.$DOMAIN"
main_muc = "conference.$DOMAIN" main_muc = "conference.$DOMAIN"
muc_lobby_whitelist = { "recorder.$DOMAIN", "auth.$DOMAIN" } -- muc_lobby_whitelist = { "recorder.$DOMAIN", "auth.$DOMAIN" }
modules_enabled = { modules_enabled = {
"speakerstats"; "speakerstats";
"conference_duration"; -- "conference_duration";
"muc_lobby_rooms"; -- "muc_lobby_rooms";
} }
P_SR P_SR
@ -1074,9 +1075,10 @@ if [ "$ENABLE_SC" = "yes" ];then
echo "Waiting prosody restart to continue configuration, 15s..." echo "Waiting prosody restart to continue configuration, 15s..."
wait_seconds 15 wait_seconds 15
#Move mucs when using secure rooms - https://community.jitsi.org/t/27752/112 #Move mucs when using secure rooms - https://community.jitsi.org/t/27752/112
sed -i "s| lobby_muc = \"lobby.|-- lobby_muc = \"lobby.|" $PROSODY_FILE #Change back - https://community.jitsi.org/t/64769/136
sed -i "s| main_muc = \"conference.|-- main_muc = \"conference.|" $PROSODY_FILE #sed -i "s| lobby_muc = \"lobby.|-- lobby_muc = \"lobby.|" $PROSODY_FILE
sed -i "s| muc_lobby_whitelist = { \"recorder.|-- muc_lobby_whitelist = { \"recorder.|" $PROSODY_FILE #sed -i "s| main_muc = \"conference.|-- main_muc = \"conference.|" $PROSODY_FILE
sed -i "s| muc_lobby_whitelist = { \"recorder.*| muc_lobby_whitelist = { \"recorder.$DOMAIN\", \"auth.$DOMAIN\" }|" $PROSODY_FILE
#EO_TF #EO_TF
fi fi