From 2d28a3299d3df4ecdbb8c584558f3f153335fc38 Mon Sep 17 00:00:00 2001 From: Ark74 Date: Tue, 5 Jan 2021 01:09:54 -0600 Subject: [PATCH 1/5] Update Readme --- README.md | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index bdac645..5b1f83f 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ bash quick-jibri-installer.sh ### Add Jibri node -Copy the modified `add-jibri-node.sh` file from your early cloned installation directory once it's completed to the new server meant to be a jibri node using your preferred method, then run it +Copy the modified `add-jibri-node.sh` file from your early cloned installation directory once the installation is completed, to the new server meant to be a jibri node using your preferred method, then run it **WARNING:** This file contains sensitive information from your setup, please handle with care. @@ -24,6 +24,16 @@ Copy the modified `add-jibri-node.sh` file from your early cloned installation d bash add-jibri-node.sh ``` +### Add JVB2 node + +Copy the modified `add-jvb2-node.sh` file from your early cloned installation directory once the installation is completed, to the new server meant to be a jibri node using your preferred method, then run it + +**WARNING:** This file contains sensitive information from your setup, please handle with care. + +``` +bash add-jvb2-node.sh +``` + Check more details on our wiki. ## Requirements @@ -57,8 +67,14 @@ Feel free to use our `test-jibri-env.sh` tool to find some details on your curre * Customized brandless mode * Setting up custom interface_config.js * Grafana Dashboard -* Lobby Rooms - Secure Rooms -* Conference Duration - Secure Rooms +* Lobby Rooms via + * Local (Secure Rooms) auth + * JWT auth + * None +* Conference Duration via + * Local (Secure Rooms) auth + * JWT auth + * None * Automatic Jibri nodes network sync ([see more](https://github.com/switnet-ltd/quick-jibri-installer/wiki/Setup-and-Jibri-Nodes)). * (New) JVB2 nodes network. * (New) JWT auth. From 7f17bc744a68a755abd7ba6c731b5bc705bab1eb Mon Sep 17 00:00:00 2001 From: Ark74 Date: Tue, 5 Jan 2021 01:11:42 -0600 Subject: [PATCH 2/5] Fix widescreen format and HD resolution as default --- quick_jibri_installer.sh | 53 ++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 16 deletions(-) diff --git a/quick_jibri_installer.sh b/quick_jibri_installer.sh index 0471943..d36d13d 100644 --- a/quick_jibri_installer.sh +++ b/quick_jibri_installer.sh @@ -750,20 +750,6 @@ else sed -i "s|// defaultLanguage: 'en',|defaultLanguage: \'$JB_LANG\',|" $MEET_CONF fi -#Check config file -echo -e "\n# Checking $MEET_CONF file for errors\n" -CHECKJS=$(esvalidate $MEET_CONF| cut -d ":" -f2) -if [[ -z "$CHECKJS" ]]; then -echo -e "\n# The $MEET_CONF configuration seems correct. =)\n" -else -echo " -Watch out!, there seems to be an issue on $MEET_CONF line: -$CHECKJS -Most of the times this is due upstream changes, please report to -https://github.com/switnet-ltd/quick-jibri-installer/issues -" -fi - # Recording directory if [ ! -d $DIR_RECORD ]; then mkdir $DIR_RECORD @@ -960,7 +946,7 @@ elif [ "$DROP_TLS1" = "yes" ] && [ "$DIST" = "xenial" ];then elif [ "$DROP_TLS1" = "no" ];then echo "No TLSv1/1.1 dropping was done." else -echo "No contidion meet, please report to +echo "No condition meet, please report to https://github.com/switnet-ltd/quick-jibri-installer/issues " fi @@ -1018,6 +1004,7 @@ P_SR fi #====================== +# Custom settings #Start with video muted by default sed -i "s|// startWithVideoMuted: false,|startWithVideoMuted: true,|" $MEET_CONF @@ -1033,6 +1020,40 @@ fi #Set displayname as not required since jibri can't set it up. sed -i "s|// requireDisplayName: true,|requireDisplayName: false,|" $MEET_CONF +#Set HD resolution and widescreen format +sed -i "/Enable \/ disable simulcast support/i \/\/ Start QJI - Set resolution and widescreen format" $MEET_CONF +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ resolution: 720," $MEET_CONF +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ constraints: {" $MEET_CONF +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ aspectRatio: 16 \/ 9," $MEET_CONF +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ video: {" $MEET_CONF +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ height: {" $MEET_CONF +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ ideal: 720," $MEET_CONF +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ max: 720," $MEET_CONF +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ min: 180" $MEET_CONF +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ }," $MEET_CONF +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ width: {" $MEET_CONF +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ ideal: 1280," $MEET_CONF +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ max: 1280," $MEET_CONF +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ min: 320" $MEET_CONF +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ }" $MEET_CONF +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ }" $MEET_CONF +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ }," $MEET_CONF +sed -i "/Enable \/ disable simulcast support/i \/\/ End QJI" $MEET_CONF + +#Check config file +echo -e "\n# Checking $MEET_CONF file for errors\n" +CHECKJS=$(esvalidate $MEET_CONF| cut -d ":" -f2) +if [[ -z "$CHECKJS" ]]; then +echo -e "\n# The $MEET_CONF configuration seems correct. =)\n" +else +echo " +Watch out!, there seems to be an issue on $MEET_CONF line: +$CHECKJS +Most of the times this is due upstream changes, please report to +https://github.com/switnet-ltd/quick-jibri-installer/issues +" +fi + #Enable jibri services systemctl enable jibri systemctl enable jibri-xorg @@ -1043,7 +1064,7 @@ if [ "$DISABLE_LOCAL_JIBRI" = "yes" ]; then systemctl disable jibri systemctl disable jibri-xorg systemctl disable jibri-icewm -#Manually apply permissions since finalize_recording.sh won't be triggered on this server. +# Manually apply permissions since finalize_recording.sh won't be triggered under this server options. sudo -u jibri bash /home/jibri/finalize_recording.sh fi From 129e3984edcb66318d8813d98e4915e66379d2a4 Mon Sep 17 00:00:00 2001 From: Ark74 Date: Tue, 5 Jan 2021 02:05:32 -0600 Subject: [PATCH 3/5] Set widescreen resolution and add option to dis/enable chat. --- mode/chp-mode.sh | 175 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 156 insertions(+), 19 deletions(-) diff --git a/mode/chp-mode.sh b/mode/chp-mode.sh index c44629a..14a82d7 100644 --- a/mode/chp-mode.sh +++ b/mode/chp-mode.sh @@ -44,6 +44,7 @@ INT_CONF_JS="/etc/jitsi/meet/${DOMAIN}-interface_config.js" INT_CONF_JS_HP="/etc/jitsi/meet/${DOMAIN}-chp-interface_config.js" WS_CONF="/etc/nginx/sites-enabled/$DOMAIN.conf" FSTAB="/etc/fstab" +CHAT_DISABLED="TBD" if [ -z $LTS_REL ] || [ -z $DOMAIN ];then echo "This system isn't suitable to configure." @@ -60,9 +61,17 @@ Overview: * jvb2 logging * jicofo logging * meet logging - - Modify UX by changing session configuration & toolbar. + - Modify UX by changing session configuration & toolbar." -Try to avoid running multiple times on the same machine, idempotence not guaranteed." +if [ -f $MEET_CONF_HP ] || [ -f $MEET_CONF_HP ]; then +echo "Try to avoid running multiple times on the same machine, +idempotence not guaranteed, exiting..." +exit +fi + +#Tools to consider +##Profiling +#https://github.com/jvm-profiling-tools/async-profiler while [[ "$CONTINUE_HP" != "yes" && "$CONTINUE_HP" != "no" ]] do @@ -75,9 +84,59 @@ while [[ "$CONTINUE_HP" != "yes" && "$CONTINUE_HP" != "no" ]] fi done -#Tools to consider -##Profiling -#https://github.com/jvm-profiling-tools/async-profiler +# Video resolution selector +echo " +#-------------------------------------------------- +# Conference widescreen video resolution. +#-------------------------------------------------- +" +echo "If you are using a high volume of users we recommend to use nHD (640x360), +or at most qHD (960x540) resolution as default, since bandwith increase +exponentially with the more concurrent users on a meeting. +Either way, choose your desired video resolution. +" + +PS3='Select the desired resolution for high performance mode: ' +options=("nHD - 640x360" "qHD - 960x540" "HD - 1280x720") +select opt in "${options[@]}" +do + case $opt in + "nHD - 640x360") + echo -e "\n > Setting 640x360 resolution.\n" + VID_RES="360" + break + ;; + "qHD - 960x540") + echo -e "\n > Setting 960x540 resolution.\n" + VID_RES="540" + break + ;; + "HD - 1280x720") + echo -e "\n > Setting 1280x720 resolution.\n" + VID_RES="720" + break + ;; + *) echo "Invalid option $REPLY, choose 1, 2 or 3";; + esac +done + +echo " +# Disable Chat? +> In case you have your own chat solution for the meetings you might +wanna disable Jitsi's chat from the toolbox. +" +while [[ "$CHAT_DISABLED" != "yes" && \ + "$CHAT_DISABLED" != "no" && \ + "$CHAT_DISABLED" != "" ]] +do +echo "> Do you want to disable jitsi's built-in chat?: (yes or no)" +read -p "(Also you can leave empty to disable)"$'\n' CHAT_DISABLED +if [ "$CHAT_DISABLED" = "no" ]; then + echo -e "-- Jitsi's built-in chat will be kept active.\n" +elif [ "$CHAT_DISABLED" = "yes" ] || [ -z "$CHAT_DISABLED" ]; then + echo -e "-- Jitsi's built-in chat will be disabled. \n" +fi +done #SYSTEM ##Disable swap @@ -137,22 +196,71 @@ sed -i "s|// startVideoMuted:.*|startVideoMuted: 5,|" $MEET_CONF_HP sed -i "s|startWithVideoMuted: true,|startWithVideoMuted: false,|" $MEET_CONF_HP sed -i "s|channelLastN:.*|channelLastN: 10,|" $MEET_CONF_HP sed -i "s|// enableLayerSuspension:.*|enableLayerSuspension: true,|" $MEET_CONF_HP -sed -i "s|// resolution:.*|resolution: 480,|" $MEET_CONF_HP sed -i "s|// apiLogLevels:.*|apiLogLevels: \['warn', 'error'],|" $MEET_CONF_HP -sed -i "/w3c spec-compliant/,/disableSimulcast:/s|// constraints: {| constraints: {|" $MEET_CONF_HP -###Standar 4:3 -#sed -i "/w3c spec-compliant/,/disableSimulcast:/s|// video: {| video: {|" $MEET_CONF_HP -###Widescreen 16:9 -sed -i "/w3c spec-compliant/,/disableSimulcast:/s|// video: {| video: {\\ -\ \ \ \ \ \ \ \ \ \ \ \ \ aspectRatio: 16 / 9,|" $MEET_CONF_HP -sed -i "/w3c spec-compliant/,/disableSimulcast:/s|// height: {| height: {|" $MEET_CONF_HP -sed -i "/w3c spec-compliant/,/disableSimulcast:/s|// ideal:.*| ideal: 480,|" $MEET_CONF_HP -sed -i "/w3c spec-compliant/,/disableSimulcast:/s|// max:.*| max: 480,|" $MEET_CONF_HP -sed -i "/w3c spec-compliant/,/disableSimulcast:/s|// min:.*| min:240|" $MEET_CONF_HP -sed -i "/w3c spec-compliant/,/disableSimulcast:/s|// }| }|" $MEET_CONF_HP -sed -i "/w3c spec-compliant/,/disableSimulcast:/s|// }| }|" $MEET_CONF_HP -sed -i "/w3c spec-compliant/,/disableSimulcast:/s|// },| },|" $MEET_CONF_HP +if [ "$VID_RES" = "360" ]; then +sed -i "/Start QJI/,/End QJI/d" $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \/\/ Start QJI - Set resolution and widescreen format" $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ resolution: 360," $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ constraints: {" $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ aspectRatio: 16 \/ 9," $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ video: {" $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ height: {" $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ ideal: 360," $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ max: 360," $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ min: 180" $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ }," $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ width: {" $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ ideal: 640," $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ max: 640," $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ min: 320" $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ }" $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ }" $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ }," $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \/\/ End QJI" $MEET_CONF_HP +fi +if [ "$VID_RES" = "540" ]; then +sed -i "/Start QJI/,/End QJI/d" $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \/\/ Start QJI - Set resolution and widescreen format" $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ resolution: 540," $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ constraints: {" $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ aspectRatio: 16 \/ 9," $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ video: {" $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ height: {" $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ ideal: 540," $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ max: 540," $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ min: 180" $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ }," $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ width: {" $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ ideal: 960," $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ max: 960," $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ min: 320" $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ }" $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ }" $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ }," $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \/\/ End QJI" $MEET_CONF_HP +fi +if [ "$VID_RES" = "720" ]; then +sed -i "/Start QJI/,/End QJI/d" $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \/\/ Start QJI - Set resolution and widescreen format" $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ resolution: 720," $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ constraints: {" $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ aspectRatio: 16 \/ 9," $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ video: {" $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ height: {" $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ ideal: 720," $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ max: 720," $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ min: 180" $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ }," $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ width: {" $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ ideal: 1280," $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ max: 1280," $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ min: 320" $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ \ \ \ \ }" $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ \ \ \ \ }" $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \ \ \ \ \ }," $MEET_CONF_HP +sed -i "/Enable \/ disable simulcast support/i \/\/ End QJI" $MEET_CONF_HP +fi ## interface_config.js cp $INT_CONF_JS $INT_CONF_JS_HP @@ -169,12 +277,41 @@ sed -i "/^\s*TOOLBAR_BUTTONS*\]$/ s|^|//|; /^\s*TOOLBAR_BUTTONS/, /\],$/ s|^|//| sed -i "/\/\/ TOOLBAR_BUTTONS/i \ \ \ \ TOOLBAR_BUTTONS: \[" $INT_CONF_JS_HP sed -i "/\/\/ TOOLBAR_BUTTONS/i \ \ \ \ \ \ \ \ 'microphone', 'camera', 'desktop', 'fullscreen'," $INT_CONF_JS_HP +if [ -z "$CHAT_DISABLED" ] || [ "$CHAT_DISABLED" = "yes" ]; then sed -i "/\/\/ TOOLBAR_BUTTONS/i \ \ \ \ \ \ \ \ 'fodeviceselection', 'hangup', 'profile', 'recording'," $INT_CONF_JS_HP +else +sed -i "/\/\/ TOOLBAR_BUTTONS/i \ \ \ \ \ \ \ \ 'fodeviceselection', 'hangup', 'profile', 'chat', 'recording'," $INT_CONF_JS_HP +fi sed -i "/\/\/ TOOLBAR_BUTTONS/i \ \ \ \ \ \ \ \ 'etherpad', 'settings', 'raisehand'," $INT_CONF_JS_HP sed -i "/\/\/ TOOLBAR_BUTTONS/i \ \ \ \ \ \ \ \ 'videoquality', 'filmstrip', 'feedback'," $INT_CONF_JS_HP sed -i "/\/\/ TOOLBAR_BUTTONS/i \ \ \ \ \ \ \ \ 'tileview', 'download', 'help', 'mute-everyone', 'security'" $INT_CONF_JS_HP sed -i "/\/\/ TOOLBAR_BUTTONS/i \ \ \ \ \]," $INT_CONF_JS_HP +#Check config file +echo -e "\n# Checking $MEET_CONF file for errors\n" +CHECKJS_MEET_CHP=$(esvalidate $MEET_CONF_HP| cut -d ":" -f2) +if [ -z "$CHECKJS_MEET_CHP" ]; then +echo -e "\n# The $MEET_CONF_HP configuration seems correct. =)\n" +else +echo " +Watch out!, there seems to be an issue on $MEET_CONF line: +$CHECKJS +Most of the times this is due upstream changes, please report to +https://github.com/switnet-ltd/quick-jibri-installer/issues +" +fi +CHECKJS_INT_CHP=$(esvalidate $INT_CONF_JS_HP| cut -d ":" -f2) +if [ -z "$CHECKJS_INT_CHP" ]; then +echo -e "\n# The $INT_CONF_JS_HP configuration seems correct. =)\n" +else +echo " +Watch out!, there seems to be an issue on $MEET_CONF line: +$CHECKJS +Most of the times this is due upstream changes, please report to +https://github.com/switnet-ltd/quick-jibri-installer/issues +" +fi + sed -i "s|$MEET_CONF|$MEET_CONF_HP|g" $WS_CONF sed -i "s|$INT_CONF_JS|$INT_CONF_JS_HP|" $WS_CONF nginx -t From fa10514b6b37b419e3a49b322733a2e9ec688725 Mon Sep 17 00:00:00 2001 From: Ark74 Date: Tue, 5 Jan 2021 17:52:26 -0600 Subject: [PATCH 4/5] Adding firefox to unsupported browsers with CHP mode --- mode/chp-mode.sh | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/mode/chp-mode.sh b/mode/chp-mode.sh index 14a82d7..3fc9bb4 100644 --- a/mode/chp-mode.sh +++ b/mode/chp-mode.sh @@ -46,6 +46,13 @@ WS_CONF="/etc/nginx/sites-enabled/$DOMAIN.conf" FSTAB="/etc/fstab" CHAT_DISABLED="TBD" +if [ -f $MEET_CONF_HP ] || [ -f $INT_CONF_JS_HP ]; then +echo " +This script can't be run multiple times on the same system, +idempotence not guaranteed, exiting..." +exit +fi + if [ -z $LTS_REL ] || [ -z $DOMAIN ];then echo "This system isn't suitable to configure." exit @@ -61,13 +68,15 @@ Overview: * jvb2 logging * jicofo logging * meet logging - - Modify UX by changing session configuration & toolbar." - -if [ -f $MEET_CONF_HP ] || [ -f $MEET_CONF_HP ]; then -echo "Try to avoid running multiple times on the same machine, -idempotence not guaranteed, exiting..." -exit -fi + - Modify UX by changing session configuration & toolbar. + - Disable browsers not compatible with CHP, + * Safari + * Firefox* +" + +echo "# Note: As for January 2021 Firefox won't handdle correctly widescreen +# sizing on lower resolution than HD (nHD & qHD), setting as incompatible for now. +" #Tools to consider ##Profiling @@ -270,7 +279,7 @@ sed -i "s|DISABLE_FOCUS_INDICATOR:.*|DISABLE_FOCUS_INDICATOR: false,|" $INT_CONF sed -i "s|DISABLE_JOIN_LEAVE_NOTIFICATIONS:.*|DISABLE_JOIN_LEAVE_NOTIFICATIONS: true,|" $INT_CONF_JS_HP sed -i "s|DISABLE_VIDEO_BACKGROUND:.*|DISABLE_VIDEO_BACKGROUND: true,|" $INT_CONF_JS_HP sed -i "s|OPTIMAL_BROWSERS: \[.*|OPTIMAL_BROWSERS: \[ 'chrome', 'chromium', 'electron' \],|" $INT_CONF_JS_HP -sed -i "s|UNSUPPORTED_BROWSERS: .*|UNSUPPORTED_BROWSERS: \[ 'nwjs', 'safari' \],|" $INT_CONF_JS_HP +sed -i "s|UNSUPPORTED_BROWSERS: .*|UNSUPPORTED_BROWSERS: \[ 'nwjs', 'safari', 'firefox' \],|" $INT_CONF_JS_HP ### Toolbars sed -i "/^\s*TOOLBAR_BUTTONS*\]$/ s|^|//|; /^\s*TOOLBAR_BUTTONS/, /\],$/ s|^|//|" $INT_CONF_JS_HP From 0828c9cdd73840a15ffb1c9bb644b7f0e9e86bdb Mon Sep 17 00:00:00 2001 From: Ark74 Date: Wed, 6 Jan 2021 11:39:53 -0600 Subject: [PATCH 5/5] Add issues url for reports. --- mode/chp-mode.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mode/chp-mode.sh b/mode/chp-mode.sh index 3fc9bb4..bbaa0ce 100644 --- a/mode/chp-mode.sh +++ b/mode/chp-mode.sh @@ -74,8 +74,10 @@ Overview: * Firefox* " -echo "# Note: As for January 2021 Firefox won't handdle correctly widescreen -# sizing on lower resolution than HD (nHD & qHD), setting as incompatible for now. +echo "# Note: As for January 2021 Firefox can't handle correctly widescreen sizing +# on lower resolution than HD (nHD & qHD), setting as incompatible for now. +# (If you know this is no longer the case. Please report it to \ +https://github.com/switnet-ltd/quick-jibri-installer/issues) " #Tools to consider