4.0 release merge #16

Merged
Ark74 merged 54 commits from unstable into master 2020-10-11 07:30:47 +00:00
2 changed files with 5 additions and 6 deletions
Showing only changes of commit 5252c1f76b - Show all commits

View File

@ -469,6 +469,7 @@ echo "
######################################################################## ########################################################################
Node addition complete!! Node addition complete!!
IMPORTANT:
The updated version of this file has been sent to the main server The updated version of this file has been sent to the main server
at the sync user home directory, please use that one in order to at the sync user home directory, please use that one in order to
install new nodes. For security reason this version has been deleted install new nodes. For security reason this version has been deleted

View File

@ -217,9 +217,9 @@ So you can add a Jibri server on a instance with enough resources.\n"
do do
read -p "> Do you want to disable local jibri service?: (yes or no)"$'\n' -r DISABLE_LOCAL_JIBRI read -p "> Do you want to disable local jibri service?: (yes or no)"$'\n' -r DISABLE_LOCAL_JIBRI
if [ "$DISABLE_LOCAL_JIBRI" = "no" ]; then if [ "$DISABLE_LOCAL_JIBRI" = "no" ]; then
echo "Please keep in mind that we might not support underpowered servers." echo -e "Please keep in mind that we might not support underpowered servers.\n"
elif [ "$DISABLE_LOCAL_JIBRI" = "yes" ]; then elif [ "$DISABLE_LOCAL_JIBRI" = "yes" ]; then
echo "You can add dedicated jibri nodes later, see more at the wiki." echo -e "You can add dedicated jibri nodes later, see more at the wiki.\n"
fi fi
done done
fi fi
@ -227,9 +227,7 @@ fi
add_prosody_repo add_prosody_repo
# Jitsi-Meet Repo # Jitsi-Meet Repo
echo " echo -e "\nAdd Jitsi repo\n"
Add Jitsi repo
"
if [ "$JITSI_REPO" = "stable" ]; then if [ "$JITSI_REPO" = "stable" ]; then
echo "Jitsi stable repository already installed" echo "Jitsi stable repository already installed"
else else
@ -897,7 +895,7 @@ echo "No contidion meet, please report to
https://github.com/switnet-ltd/quick-jibri-installer/issues " https://github.com/switnet-ltd/quick-jibri-installer/issues "
fi fi
echo -e"\nDisable \"Blur my background\" until new notice\n" echo -e "\nDisable \"Blur my background\" until new notice\n"
sed -i "s|'videobackgroundblur', ||" $INT_CONF sed -i "s|'videobackgroundblur', ||" $INT_CONF
#================== Setup prosody conf file ================= #================== Setup prosody conf file =================