README.md

@@ -119,4 +119,4 @@ Feel free to use our `test-jibri-env.sh` tool to find some details on your curre
 
 Please note: This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY.
 
-SwITNet Ltd © - 2024, https://switnet.net/
+SwITNet Ltd © - 2023, https://switnet.net/

add-jibri-node.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # Jibri Node Aggregator
-# SwITNet Ltd © - 2024, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 # GPLv3 or later.
 
 ### 0_LAST EDITION TIME STAMP ###

add-jvb2-node.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # JVB2 Node Aggregator
-# SwITNet Ltd © - 2024, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 # GPLv3 or later.
 
 ### 0_LAST EDITION TIME STAMP ###

etherpad-docker.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # Etherpad Installer for Jitsi Meet
-# SwITNet Ltd © - 2024, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 #
 # GPLv3 or later.
 
@@ -30,7 +30,7 @@ echo '
 ########################################################################
                     by Software, IT & Networks Ltd
 '
-FORGE_REPO="https://forge.switnet.net/switnet/quick-jibri-installer"
+
 check_apt_policy() {
 apt-cache policy 2>/dev/null| awk "/$1/{print \$3}" | awk -F '/' 'NR==1{print$2}'
 }
@@ -42,16 +42,6 @@ if [ "$(dpkg-query -W -f='${Status}' "$1" 2>/dev/null | grep -c "ok installed")"
         apt-get -yq2 install "$1"
 fi
 }
-# Test for matches
-test_match() {
-if grep -q "$1" "$2" ; then
-    echo "$(basename "$2") - OK..."
-else
-    echo "$(basename "$2"), FAIL..."
-    echo "Please report this to $FORGE_REPO"
-    exit
-fi
-}
 DOMAIN="$(find /etc/prosody/conf.d/ -name \*.lua|awk -F'.cfg' '!/localhost/{print $1}'|xargs basename)"
 MEET_CONF="/etc/jitsi/meet/$DOMAIN-config.js"
 WS_CONF="/etc/nginx/sites-available/$DOMAIN.conf"
@@ -60,7 +50,6 @@ ETHERPAD_DB_USER="dockerpad"
 ETHERPAD_DB_NAME="etherpad"
 ETHERPAD_DB_PASS="$(tr -dc "a-zA-Z0-9#*=" < /dev/urandom | fold -w 10 | head -n1)"
 DOCKER_CE_REPO="$(check_apt_policy docker)"
-WS_CONF_MATCH1="# ensure all static content can always be found first"
 
 echo "Add Docker repo"
 if [ "$DOCKER_CE_REPO" = "stable" ]; then
@@ -116,14 +105,14 @@ if [ "$(grep -c etherpad "$WS_CONF")" != 0 ]; then
     echo "> Webserver seems configured, skipping..."
 elif [ -f "$WS_CONF" ]; then
     echo "> Setting up webserver configuration file..."
-    sed -i "/$WS_CONF_MATCH1/i \ \ \ \ #Etherpad block" "$WS_CONF"
+    sed -i "/# ensure all static content can always be found first/i \ \ \ \ #Etherpad block" "$WS_CONF"
-    sed -i "/$WS_CONF_MATCH1/i \ \ \ \ location \^\~\ \/etherpad\/ {" "$WS_CONF"
+    sed -i "/# ensure all static content can always be found first/i \ \ \ \ location \^\~\ \/etherpad\/ {" "$WS_CONF"
-    sed -i "/$WS_CONF_MATCH1/i \ \ \ \ \ \ \ \ proxy_pass http:\/\/localhost:9001\/;" "$WS_CONF"
+    sed -i "/# ensure all static content can always be found first/i \ \ \ \ \ \ \ \ proxy_pass http:\/\/localhost:9001\/;" "$WS_CONF"
-    sed -i "/$WS_CONF_MATCH1/i \ \ \ \ \ \ \ \ proxy_set_header X-Forwarded-For \$remote_addr;" "$WS_CONF"
+    sed -i "/# ensure all static content can always be found first/i \ \ \ \ \ \ \ \ proxy_set_header X-Forwarded-For \$remote_addr;" "$WS_CONF"
-    sed -i "/$WS_CONF_MATCH1/i \ \ \ \ \ \ \ \ proxy_buffering off;" "$WS_CONF"
+    sed -i "/# ensure all static content can always be found first/i \ \ \ \ \ \ \ \ proxy_buffering off;" "$WS_CONF"
-    sed -i "/$WS_CONF_MATCH1/i \ \ \ \ \ \ \ \ proxy_set_header       Host \$host;" "$WS_CONF"
+    sed -i "/# ensure all static content can always be found first/i \ \ \ \ \ \ \ \ proxy_set_header       Host \$host;" "$WS_CONF"
-    sed -i "/$WS_CONF_MATCH1/i \ \ \ \ }" "$WS_CONF"
+    sed -i "/# ensure all static content can always be found first/i \ \ \ \ }" "$WS_CONF"
-    sed -i "/$WS_CONF_MATCH1/i \\\n" "$WS_CONF"
+    sed -i "/# ensure all static content can always be found first/i \\\n" "$WS_CONF"
 else
     echo "> No etherpad config done to server file, please report to:
     -> https://forge.switnet.net/switnet/quick-jibri-installer/issues"

excalidraw-backend.sh

@@ -4,7 +4,7 @@
 # Based on:
 # - https://community.jitsi.org/t/118883
 #
-# SwITNet Ltd © - 2024, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 # GPLv3 or later.
 
 # Reset

grafana.sh

@@ -8,7 +8,7 @@
 # by "mephisto"
 #
 # Igor Kerstges © - 2021
-# SwITNet Ltd © - 2024, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 #
 # GPLv3 or later.
 

images/watermark2.svg

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="0.00026458237mm"
-   height="0.00037725855mm"
-   viewBox="0 0 0.00026458237 0.00037725855"
-   version="1.1"
-   id="svg1"
-   inkscape:version="1.3.2 (1:1.3.2+202311252150+091e20ef0f)"
-   sodipodi:docname="watermark2.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview1"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="mm"
-     inkscape:zoom="32.776423"
-     inkscape:cx="3.8442267"
-     inkscape:cy="9.4732729"
-     inkscape:window-width="1918"
-     inkscape:window-height="1008"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs1" />
-  <g
-     inkscape:label="Capa 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-73.084889,-67.205357)">
-    <rect
-       style="fill:#8080ff;stroke:#ffffff;stroke-width:1"
-       id="rect1"
-       width="0"
-       height="0"
-       x="75.899414"
-       y="71.763123" />
-    <rect
-       style="fill:#8080ff;stroke:#ffffff;stroke-width:0.000112676;stroke-dasharray:none"
-       id="rect2"
-       width="0.00015190637"
-       height="0.00026458254"
-       x="73.084946"
-       y="67.205414" />
-  </g>
-</svg>

jitsi-updater.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # Jitsi Meet recurring upgrader and customization keeper
 # for Debian/*buntu binaries.
-# SwITNet Ltd © - 2024, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 # GNU GPLv3 or later.
 
 while getopts m: option

jm-bm.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # Jitsi Meet brandless mode
 # for Debian/*buntu binaries.
-# SwITNet Ltd © - 2024, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 # GNU GPLv3 or later.
 
 while getopts m: option
@@ -27,7 +27,6 @@ BUNDLE_JS="/usr/share/jitsi-meet/libs/app.bundle.min.js"
 #
 JM_IMG_PATH="/usr/share/jitsi-meet/images"
 WTM2_PATH="$JM_IMG_PATH/watermark2.png"
-WTM2_SVG_PATH="$JM_IMG_PATH/watermark2.png"
 FICON_PATH="$JM_IMG_PATH/favicon2.ico"
 REC_ICON_PATH="$JM_IMG_PATH/gnome_record.png"
 #
@@ -37,30 +36,29 @@ PART_USER="Participant"
 LOCAL_USER="me"
 #
 #SEC_ROOM="TBD"
-copy_if_not_there() {
-	if [ ! -f "$1" ]; then
-        cp images/"$(echo $1|xargs basename)" "$1"
-    else
-        echo "$(echo $1|xargs basename) file exists, skipping copying..."
-    fi
-}
 echo '
 #--------------------------------------------------
 # Applying Brandless mode
 #--------------------------------------------------
 '
-
 #Watermark
-copy_if_not_there "$WTM2_PATH"
+if [ ! -f "$WTM2_PATH" ]; then
-
+    cp images/watermark2.png "$WTM2_PATH"
-#Watermark svg
+else
-copy_if_not_there "$WTM2_SVG_PATH"
+    echo "watermark2 file exists, skipping copying..."
-
+fi
 #Favicon
-copy_if_not_there "$FICON_PATH"
+if [ ! -f "$FICON_PATH" ]; then
-
+    cp images/favicon2.ico "$FICON_PATH"
+else
+    echo "favicon2 file exists, skipping copying..."
+fi
 #Local recording icon
-copy_if_not_there "$REC_ICON_PATH"
+if [ ! -f "$REC_ICON_PATH" ];then
+    cp images/gnome_record.png "$REC_ICON_PATH"
+else
+    echo "recording icon exists, skipping copying..."
+fi
 
 #Custom / Remove icons
 sed -i "s|watermark.png|watermark2.png|g" "$CSS_FILE"
@@ -72,8 +70,6 @@ sed -i "s|icon-cloud.png|gnome_record.png|g" "$BUNDLE_JS"
 if ! grep -q ".leftwatermark{display:none" "$CSS_FILE" ; then
     sed -i "s|.leftwatermark{|.leftwatermark{display:none;|" "$CSS_FILE"
 fi
-#Replace App logo
-sed -i "s|// defaultLogoUrl: .*|    defaultLogoUrl: 'images/watermark2.svg',|" "$MEET_CONF"
 
 #Customize room title
 sed -i "s|Jitsi Meet|$APP_NAME|g" "$TITLE_FILE"

jra_nextcloud.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # JRA (Jibri Recordings Access) via Nextcloud
-# SwITNet Ltd © - 2024, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 # GPLv3 or later.
 
 while getopts m: option
@@ -59,7 +59,7 @@ DIR_RECORD="$(awk  -F '"' '/RECORDING/{print$2}'  /home/jibri/finalize_recording
 REDIS_CONF="/etc/redis/redis.conf"
 JITSI_MEET_PROXY="/etc/nginx/modules-enabled/60-jitsi-meet.conf"
 [ -f "$JITSI_MEET_PROXY" ] && PREAD_PROXY=$(grep -nr "preread_server_name" "$JITSI_MEET_PROXY" | cut -d ":" -f1)
-PUBLIC_IP="$(dig -4 +short myip.opendns.com @resolver1.opendns.com)"
+PUBLIC_IP="$(dig +short myip.opendns.com @resolver1.opendns.com)"
 ISO3166_CODE=TBD
 NL="$(printf '\n  ')"
 

mode/chp-mode.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # Custom High Performance Jitsi conf
-# SwITNet Ltd © - 2024, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 # GPLv3 or later.
 
 while getopts m: option

mode/grid/selenium-grid-docker.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # Custom Selenium Grid-Node fro Jitsi Meet
 # Pandian © - https://community.jitsi.org/u/Pandian
-# SwITNet Ltd © - 2024, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 # GPLv3 or later.
 
 while getopts m: option

mode/jms-stu.sh

@@ -2,7 +2,7 @@
 # System-tune-up to remove system software restrictions on a huge load of connections.
 # Be aware that hardware/infrastructure resources are the most common limiters.
 #
-# SwITNet Ltd © - 2024, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 # GPLv3 or later.
 
 while getopts m: option

mode/jwt.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # JWT Mode Setup
-# SwITNet Ltd © - 2024, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 # GPLv3 or later.
 
 while getopts m: option

quick_jibri_installer.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # Quick Jibri Installer - *buntu (LTS) based systems.
-# SwITNet Ltd © - 2024, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 # GPLv3 or later.
 {
 echo "Started at $(date +'%Y-%m-%d %H:%M:%S')" >> qj-installer.log
@@ -567,6 +567,18 @@ do
   fi
 done
 sleep .1
+#Language
+echo "## Setting up Jitsi Meet language ##
+You can define the language, for a complete list of the supported languages
+
+See here:
+https://github.com/jitsi/jitsi-meet/blob/master/lang/languages.json"
+printf "Jitsi Meet web interface will be set to use such language.\n\n"
+sleep .1
+read -p "Please set your language (Press enter to default to 'en'):$NL" -r JB_LANG
+sleep .1
+printf "\nWe'll take a minute to localize some UI excerpts if you need.\n\n"
+sleep .1
 #Participant
 printf "> Do you want to translate 'Participant' to your own language?\n"
 sleep .1
@@ -864,17 +876,18 @@ sed -i "s|conference.$DOMAIN|internal.auth.$DOMAIN|" "$MEET_CONF"
 sed -i "s|// recordingService:|recordingService:|" "$MEET_CONF"
 sed -i "/recordingService/,/hideStorageWarning/s|//     enabled: false,|       enabled: true,|" "$MEET_CONF"
 sed -i "/hideStorageWarning: false/,/Local recording configuration/s|// },|},|" "$MEET_CONF"
-sed -i "/fileRecordingsServiceEnabled: false,/a \\
+sed -i "s|// liveStreamingEnabled: false,|liveStreamingEnabled: true,\\
-    hiddenDomain: \'recorder.$DOMAIN\'," "$MEET_CONF"
+\\
+    hiddenDomain: \'recorder.$DOMAIN\',|" "$MEET_CONF"
 
-##Setup main language
+#Setup main language
-#if [ -z "$JB_LANG" ] || [ "$JB_LANG" = "en" ]; then
+if [ -z "$JB_LANG" ] || [ "$JB_LANG" = "en" ]; then
-    #echo "Leaving English (en) as default language..."
+    echo "Leaving English (en) as default language..."
-    #sed -i "s|// defaultLanguage: 'en',|defaultLanguage: 'en',|" "$MEET_CONF"
+    sed -i "s|// defaultLanguage: 'en',|defaultLanguage: 'en',|" "$MEET_CONF"
-#else
+else
-    #echo "Changing default language to: $JB_LANG"
+    echo "Changing default language to: $JB_LANG"
-    #sed -i "s|// defaultLanguage: 'en',|defaultLanguage: \'$JB_LANG\',|" "$MEET_CONF"
+    sed -i "s|// defaultLanguage: 'en',|defaultLanguage: \'$JB_LANG\',|" "$MEET_CONF"
-#fi
+fi
 
 # Recording directory
 if [ ! -d "$DIR_RECORD" ]; then
@@ -1184,11 +1197,9 @@ sed -i "s|// startAudioMuted: 10,|startAudioMuted: 1,|" "$MEET_CONF"
 
 #Disable/enable welcome page
 if [ "$ENABLE_WELCP" = "yes" ]; then
-    sed -i "/ welcomePage: {/,/},/s|// ||" "$MEET_CONF"
+    sed -i "s|.*enableWelcomePage:.*|    enableWelcomePage: false,|" "$MEET_CONF"
-    sed -i "/ welcomePage: {/,/},/s|disabled: .*,|disabled: true,|" "$MEET_CONF"
 elif [ "$ENABLE_WELCP" = "no" ]; then
-    sed -i "/ welcomePage: {/,/},/s|// ||" "$MEET_CONF"
+    sed -i "s|.*enableWelcomePage:.*|    enableWelcomePage: true,|" "$MEET_CONF"
-    sed -i "/ welcomePage: {/,/},/s|disabled: .*,|disabled: false,|" "$MEET_CONF"
 fi
 #Enable close page
 if [ "$ENABLE_CLOCP" = "yes" ]; then

tools/aws-grub-setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # Automated AWS generic kernel setup for jibri.
-# SwITNet Ltd © - 2024, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 # GPLv3 or later.
 
 while getopts m: option

tools/fail2ban_ssh.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # Simple Fail2ban configuration
-# SwITNet Ltd © - 2024, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 # GNU GPLv3 or later.
 
 while getopts m: option

tools/jibri-conf-upgrade.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # Simple Jibri conf updater
-# SwITNet Ltd © - 2024, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 # GNU GPLv3 or later.
 
 while getopts m: option

tools/jibri-resolution-enhancer.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # Simple Jibri resolution enhancer
-# SwITNet Ltd © - 2024, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 # GNU GPLv3 or later.
 
 while getopts m: option

tools/start-over.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #Start over
-# SwITNet Ltd © - 2024, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 # GPLv3 or later.
 
 while getopts m: option

tools/test-jibri-env.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # Simple Jibri Env tester
-# SwITNet Ltd © - 2024, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 # GNU GPLv3 or later.
 
 while getopts m: option