Merge pull request #23 from switnet-ltd/unstable

Final version 5.0.0
switnet-ltd · Dec 22, 2020 · 3e07367 · 3e07367
2 parents b25cb90 + d5a340e
commit 3e07367
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,6 @@ Copy the modified `add-jibri-node.sh` file from your early cloned installation d
 bash add-jibri-node.sh
 ```
 
-
 Check more details on our wiki.
 
 ## Requirements
@@ -46,7 +45,7 @@ For AWS users or any cloud service provider that might use their own kernel on t
 
 Make sure that you update your grub to boot the right one.
 
-Feel free to use our (new) `test-jibri-env.sh` tool to find some details on your current setup.
+Feel free to use our `test-jibri-env.sh` tool to find some details on your current setup.
 
 ## Features
 * Enabled Session Recording using Jibri
@@ -60,17 +59,23 @@ Feel free to use our (new) `test-jibri-env.sh` tool to find some details on your
 * Grafana Dashboard
 * Lobby Rooms - Secure Rooms
 * Conference Duration - Secure Rooms
-* (New) Automatic Jibri nodes network sync ([see more](https://github.com/switnet-ltd/quick-jibri-installer/wiki/Setup-and-Jibri-Nodes)).
+* 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.
 
 ## Tools (New)
-* (New) Jibri Environment Tester
- * (New) Jibri Conf Upgrader (late 2020).
+* Jibri Environment Tester
+ * Jibri Conf Upgrader (late 2020).
+* (New) Selenium Grid via Docker
 
 ## Optional custom changes
 * Optional default language
 * Option to enable Secure Rooms
 * Option to enable Welcome Page
 
+### Modes
+* (New) Custom High Performance config
+
 ## Custom changes
 * Start with video muted by default
 * Start with audio muted but moderator

diff --git a/mode/chp-mode.sh b/mode/chp-mode.sh
@@ -51,6 +51,18 @@ exit
   else
 echo "This system seems suitable to configure..."
 fi
+echo "What does this script do?
+Overview:
+ - Disables swap partition
+ - Tunes,
+   * Some kernel networking settings
+   * nginx connections number
+   * jvb2 logging
+   * jicofo logging
+   * meet logging
+ - Modify UX by changing session configuration & toolbar.
+ 
+Try to avoid running multiple times on the same machine, idempotence not guaranteed."
 
 while [[ "$CONTINUE_HP" != "yes" && "$CONTINUE_HP" != "no" ]]
     do
@@ -115,6 +127,7 @@ sed -i "/CallStats.js/s|info|error|" $MEET_LOG_CONF
 sed -i "/strophe.util.js/s|log|error|" $MEET_LOG_CONF
 
 #UX - Room settings and interface
+## config.js
 cp $MEET_CONF $MEET_CONF_HP
 sed -i "s|// disableAudioLevels:.*|disableAudioLevels: true,|" $MEET_CONF_HP
 sed -i "s|enableNoAudioDetection:.*|enableNoAudioDetection: false,|" $MEET_CONF_HP
@@ -128,7 +141,11 @@ 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
-sed -i "/w3c spec-compliant/,/disableSimulcast:/s|//     video: {|     video: {|" $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
@@ -137,6 +154,7 @@ sed -i "/w3c spec-compliant/,/disableSimulcast:/s|//         }|         }|" $MEE
 sed -i "/w3c spec-compliant/,/disableSimulcast:/s|//     }|     }|" $MEET_CONF_HP
 sed -i "/w3c spec-compliant/,/disableSimulcast:/s|// },| },|" $MEET_CONF_HP
 
+## interface_config.js
 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|DISABLE_DOMINANT_SPEAKER_INDICATOR:.*|DISABLE_DOMINANT_SPEAKER_INDICATOR: true,|" $INT_CONF_JS_HP
@@ -146,7 +164,7 @@ sed -i "s|DISABLE_VIDEO_BACKGROUND:.*|DISABLE_VIDEO_BACKGROUND: true,|" $INT_CON
 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
 
-##Toolbars
+### Toolbars
 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

diff --git a/mode/grid/selenium-grid-docker.sh b/mode/grid/selenium-grid-docker.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Custom Selenium Grid-Node fro Jitsi Meet
-# Pandian - https://community.jitsi.org/u/Pandian
+# Pandian © - https://community.jitsi.org/u/Pandian
 # SwITNet Ltd © - 2020, https://switnet.net/
 # GPLv3 or later.
 
@@ -43,8 +43,13 @@ ln -s /usr/local/bin/docker-compose /usr/bin/docker-compose
 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"
+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
+fi
 cd ..
 
 #150 "participants" available