From b34f5c07f22b4729543412c71b7a4009145dc28d Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Thu, 17 Dec 2020 06:47:10 -0600
Subject: [PATCH] Add fixes

---
 mode/chp-mode.sh                  | 32 ++++++++++++++++---------------
 mode/grid/selenium-grid-docker.sh |  2 +-
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/mode/chp-mode.sh b/mode/chp-mode.sh
index cfa24ed..e5cf236 100644
--- a/mode/chp-mode.sh
+++ b/mode/chp-mode.sh
@@ -26,8 +26,9 @@ JICOFO_LOG_POP="/etc/jitsi/videobridge/logging.properties"
 MEET_LOG_CONF="/usr/share/jitsi-meet/logging_config.js"
 MEET_CONF="/etc/jitsi/meet/$DOMAIN-config.js"
 MEET_CONF_HP="/etc/jitsi/meet/${DOMAIN}-chp-config.js"
-INT_CONF_JS="/etc/jitsi/meet/meet.switnet.net-interface_config.js"
-INT_CONF_JS_HP="/etc/jitsi/meet/meet.switnet.net-chp-interface_config.js"
+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"
 
 if [ -z $LTS_REL ] || [ -z $DOMAIN ];then
@@ -106,32 +107,33 @@ sed -i "s|enableNoAudioDetection:.*|enableNoAudioDetection: false,|" $MEET_CONF_
 sed -i "s|enableNoisyMicDetection:.*|enableNoisyMicDetection: false,|" $MEET_CONF_HP
 sed -i "s|startAudioMuted:.*|startAudioMuted: 5,|" $MEET_CONF_HP
 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 "s|// apiLogLevels:.*|apiLogLevels: \['warn', 'error'],|" $MEET_CONF_HP
 
-sed -i "s|// constraints: {| constraints: {|" $MEET_CONF_HP
-sed -i "s|//     video: {|     video: {|" $MEET_CONF_HP
-sed -i "s|//         height: {|         height: {|" $MEET_CONF_HP
-sed -i "s|//             ideal:.*|             ideal: 480,|" $MEET_CONF_HP
-sed -i "s|//             max:.*|             max: 480,|" $MEET_CONF_HP
-sed -i "s|//             min:.*|             min:240|" $MEET_CONF_HP
-sed -i "s|//         }|         }|" $MEET_CONF_HP
-sed -i "s|//     }|     }|" $MEET_CONF_HP
-sed -i "s|// },| },|" $MEET_CONF_HP
+sed -i "/w3c spec-compliant/,/disableSimulcast:/s|// constraints: {| constraints: {|" $MEET_CONF_HP
+sed -i "/w3c spec-compliant/,/disableSimulcast:/s|//     video: {|     video: {|" $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
 
 cp $INT_CONF_JS $INT_CONF_JS_HP
-sed -i "s|CONNECTION_INDICATOR_DISABLED:.*|CONNECTION_INDICATOR_DISABLED: true," $INT_CONF_JS_HP
+sed -i "s|CONNECTION_INDICATOR_DISABLED:.*|CONNECTION_INDICATOR_DISABLED: true,|" $INT_CONF_JS_HP
 sed -i "s|DISABLE_DOMINANT_SPEAKER_INDICATOR:.*|DISABLE_DOMINANT_SPEAKER_INDICATOR: true,|" $INT_CONF_JS_HP
 sed -i "s|DISABLE_FOCUS_INDICATOR:.*|DISABLE_FOCUS_INDICATOR: false,|" $INT_CONF_JS_HP
 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' \],|" $INT_CONF_JS_HP
 
 ##Toolbars
-sed "/^\s*TOOLBAR_BUTTONS*\]$/ s|^|//|; /^\s*TOOLBAR_BUTTONS/, /\],$/ s|^|//|" $INT_CONF_JS_HP
+sed -i "/^\s*TOOLBAR_BUTTONS*\]$/ s|^|//|; /^\s*TOOLBAR_BUTTONS/, /\],$/ s|^|//|" $INT_CONF_JS_HP
 
 sed -i "/\/\/    TOOLBAR_BUTTONS/i \ \ \ \ TOOLBAR_BUTTONS: \[" $INT_CONF_JS_HP
 sed -i "/\/\/    TOOLBAR_BUTTONS/i \ \ \ \ \ \ \ \ 'microphone', 'camera', 'desktop', 'fullscreen'," $INT_CONF_JS_HP
diff --git a/mode/grid/selenium-grid-docker.sh b/mode/grid/selenium-grid-docker.sh
index 24f7b14..27361a7 100644
--- a/mode/grid/selenium-grid-docker.sh
+++ b/mode/grid/selenium-grid-docker.sh
@@ -13,7 +13,7 @@ fi
 WAN_IP="$(dig +short myip.opendns.com @resolver1.opendns.com)"
 AV_SPACE="$(df -h .|grep -v File|awk '{print$4}'|sed -e 's|G||')"
 
-echo -e "\n-- Make sure you have at least 10GB of disk space"
+echo -e "\n-- Make sure you have at least 10GB of disk space available.\n"
 if [ $(echo "$AV_SPACE > 9" | bc) -ne 0 ]; then
   echo "> Seems we have enough disk space."
 else