switnet
/
quick-jibri-installer
2
1
Fork 1
Code Issues 2 Pull Requests Packages Projects Releases 13 Wiki Activity

Merge pull request #74 from switnet-ltd/unstable 

Small fixes
This commit is contained in:
Luis Guzman 2022-02-07 19:33:49 -06:00 committed by GitHub
parent 675ad873c9 59087bb319
commit 4e63ea17d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mode/grid/selenium-grid-docker.sh
View File

@ -44,11 +44,11 @@ cd /opt
git clone https://github.com/jitsi/jitsi-meet-torture
cd jitsi-meet-torture/resources
if [ -f FourPeople_1280x720_30.y4m ] ; then
echo "FourPeople_1280x720_30.y4m exists"
echo "FourPeople_1280x720_30.y4m exists"
else
echo "FourPeople_1280x720_30.y4m doesn't exists, getting a copy..."
wget -c https://media.xiph.org/video/derf/y4m/FourPeople_1280x720_60.y4m
cp FourPeople_1280x720_60.y4m FourPeople_1280x720_30.y4m
echo "FourPeople_1280x720_30.y4m doesn't exists, getting a copy..."
wget -c https://media.xiph.org/video/derf/y4m/FourPeople_1280x720_60.y4m
cp FourPeople_1280x720_60.y4m FourPeople_1280x720_30.y4m
fi
cd ..

9
quick_jibri_installer.sh
View File

@ -263,7 +263,7 @@ do
This is an unsupported use, as it will likely BREAK YOUR SYSTEM, so please don't."
exit
else
echo -e " > No standard desktop environment '$de' for user oriented porpuse detected, continuing...\n"
echo -e " > No standard desktop environment '$de' for user oriented porpuse detected, continuing..."
fi
done
@ -1084,13 +1084,8 @@ if [ "$ENABLE_SA" = "yes" ] && [ -f $WS_CONF ]; then
fi
#nginx -tlsv1/1.1
if [ "$DROP_TLS1" = "yes" ];then
echo -e "\nDropping TLSv1/1.1 in favor of v1.3\n"
sed -i "s|TLSv1 TLSv1.1|TLSv1.3|" /etc/nginx/nginx.conf
#sed -i "s|TLSv1 TLSv1.1|TLSv1.3|" $WS_CONF
elif [ "$DROP_TLS1" = "yes" ];then
echo -e "\nOnly dropping TLSv1/1.1\n"
echo -e "\nDropping TLSv1/1.1\n"
sed -i "s|TLSv1 TLSv1.1||" /etc/nginx/nginx.conf
sed -i "s| TLSv1.3||" $WS_CONF
elif [ "$DROP_TLS1" = "no" ];then
echo -e "\nNo TLSv1/1.1 dropping was done.\n"
else