7.0.2 #82

Merged
Ark74 merged 32 commits from unstable into master 2022-06-17 21:36:15 +00:00
3 changed files with 16 additions and 4 deletions
Showing only changes of commit b63021a76d - Show all commits

View File

@ -207,6 +207,10 @@ restart_services
# Brandless mode #
########################################################################
if [ "$ENABLE_BLESSM" = "on" ]; then
if [ "$MODE" = "debug" ]; then
bash "$PWD"/jm-bm.sh -m debug
else
bash "$PWD"/jm-bm.sh
fi
fi
printwc "${Blue}" "Script completed \o/!\n"

View File

@ -67,7 +67,7 @@ sed -i "s|jitsilogo.png|watermark2.png|g" "$TITLE_FILE"
sed -i "s|logo-deep-linking.png|watermark2.png|g" "$BUNDLE_JS"
sed -i "s|jitsiLogo_square.png|gnome_record.png|g" "$BUNDLE_JS"
#Disable logo and url
if ! grep -nr ".leftwatermark{display:none" "$CSS_FILE" ; then
if ! grep -q ".leftwatermark{display:none" "$CSS_FILE" ; then
sed -i "s|.leftwatermark{|.leftwatermark{display:none;|" "$CSS_FILE"
fi

View File

@ -1092,8 +1092,12 @@ sleep .1
###JWT
if [ "$ENABLE_JWT" = "yes" ]; then
printf "\nJWT auth is being setup...\n"
if [ "$MODE" = "debug" ]; then
bash "$PWD"/mode/jwt.sh -m debug
else
bash "$PWD"/mode/jwt.sh
fi
fi
sleep .1
#Guest allow
#Change back lobby - https://community.jitsi.org/t/64769/136
@ -1201,8 +1205,12 @@ fi
if [ "$ENABLE_BLESSM" = "yes" ]; then
echo "Custom brandless mode will be enabled."
sed -i "s|ENABLE_BLESSM=.*|ENABLE_BLESSM=\"on\"|" jitsi-updater.sh
if [ "$MODE" = "debug" ]; then
bash "$PWD"/jm-bm.sh -m debug
else
bash "$PWD"/jm-bm.sh
fi
fi
# Applying best practives for interface config.js
printf "\n> Setting up custom interface_config.js according to best practices."