Merge and track latest features on stable #6

Merged
Ark74 merged 71 commits from unstable into master 2020-08-08 06:41:50 +00:00
2 changed files with 6 additions and 5 deletions
Showing only changes of commit e27efa57ea - Show all commits

View File

@ -171,7 +171,7 @@ echo "opcache.validate_timestamps=1"
systemctl restart php$PHPVER-fpm.service systemctl restart php$PHPVER-fpm.service
#-------------------------------------------------- #--------------------------------------------------
# Create MySQL user # Create DB user
#-------------------------------------------------- #--------------------------------------------------
echo -e "\n---- Creating the PgSQL DB & User ----" echo -e "\n---- Creating the PgSQL DB & User ----"

View File

@ -820,14 +820,15 @@ VirtualHost "guest.$DOMAIN"
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"
main_muc = "conference.$DOMAIN"
modules_enabled = { modules_enabled = {
"speakerstats"; "speakerstats";
"conference_duration"; "conference_duration";
"muc_lobby_rooms"; "muc_lobby_rooms";
} }
lobby_muc = "lobby.qj.$DOMAIN"
main_muc = "conference.$DOMAIN"
P_SR P_SR
else else
cat << P_SR >> $PROSODY_FILE cat << P_SR >> $PROSODY_FILE
@ -872,7 +873,7 @@ restart_services
enable_letsencrypt enable_letsencrypt
if dpkg-compare prosody gt 0.11.0 && [ "S" = "" ]; then if dpkg-compare prosody gt 0.11.0 && [ "$ENABLE_SC" = "yes" ]; then
echo "Let's try wait 15s" echo "Let's try wait 15s"
wait_seconds 15 wait_seconds 15
#Temporary fix? - https://community.jitsi.org/t/27752/112 #Temporary fix? - https://community.jitsi.org/t/27752/112