README.md

@@ -56,8 +56,9 @@ Check more details on our wiki.
 ### Jibri Recodings Access via Nextcloud
 * Valid domain with DNS record for Nextcloud SSL.
  
-### Jigasi Transcript
+### Jigasi Transcript (stalled)
-* Enough disk space to run Vosk backend via docker container.
+* SIP account
+* Google Cloud Account with Billing setup.
 
 
 
@@ -78,7 +79,7 @@ Feel free to use our `test-jibri-env.sh` tool to find some details on your curre
 * Etherpad via docker install
 * Authentication
   1. Local
-  2. JWT ([#87](https://forge.switnet.net/switnet/quick-jibri-installer/issues/87))
+  2. JWT
   3. None
 * Lobby Rooms
 * Conference Duration
@@ -89,7 +90,7 @@ Feel free to use our `test-jibri-env.sh` tool to find some details on your curre
 * Enabled Jitsi Electron app detection server side.
 * Standalone SSL Certbot/LE implementation
 * Improved recurring updater
-* Jigasi Transcript - vía Vosk speech recognition toolkit.
+* Jigasi Transcript - Speech to Text powered by Google API (stalled)
 
 ## Tools
 * Jibri Environment Tester

etherpad-docker.sh

@@ -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,14 +50,12 @@ 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
     echo "Docker repository already installed"
 else
-    echo "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" > \
+    echo "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" > /etc/apt/sources.list.d/docker-ce.list
-        /etc/apt/sources.list.d/docker-ce.list
     wget -qO - https://download.docker.com/linux/ubuntu/gpg | \
     gpg --dearmor | tee /etc/apt/trusted.gpg.d/docker-gpg-key.gpg  >/dev/null
     apt -q2 update
@@ -75,9 +63,6 @@ fi
 
 read -p "Set your etherpad docker admin password: " -r ETHERPAD_ADMIN_PASS
 
-# Make sure we can rely on the match strings.
-printf "> Testing match strings on config files.\n"
-test_match "$WS_MATCH1" "$WS_CONF"
 
 # Install required packages
 install_ifnot docker-ce
@@ -120,18 +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_http_version 1.1;" "$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 Upgrade \$http_upgrade;" "$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_set_header Connection \$connection_upgrade;" "$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 X-Forwarded-For \$remote_addr;" "$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 \ \ \ \ \ \ \ \ proxy_buffering off;" "$WS_CONF"
+    sed -i "/# ensure all static content can always be found first/i \ \ \ \ }" "$WS_CONF"
-    sed -i "/$WS_CONF_MATCH1/i \ \ \ \ \ \ \ \ proxy_redirect off;" "$WS_CONF"
+    sed -i "/# ensure all static content can always be found first/i \\\n" "$WS_CONF"
-    sed -i "/$WS_CONF_MATCH1/i \ \ \ \ \ \ \ \ proxy_set_header       Host \$host;" "$WS_CONF"
-    sed -i "/$WS_CONF_MATCH1/i \ \ \ \ \ \ \ \ proxy_pass http:\/\/localhost:9001\/;" "$WS_CONF"
-    sed -i "/$WS_CONF_MATCH1/i \ \ \ \ }" "$WS_CONF"
-    sed -i "/$WS_CONF_MATCH1/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"
@@ -142,7 +123,7 @@ if [ "$(grep -c "etherpad_base" "$WS_CONF")" != 0 ]; then
     echo -e "> $MEET_CONF seems configured, skipping...\n"
 else
     echo -e "> Setting etherpad domain at $MEET_CONF...\n"
-    sed -i "s|// etherpad_base: .*|etherpad_base: \'https://$DOMAIN/etherpad/p/\',|" "$MEET_CONF"
+    sed -i "/ openSharedDocumentOnJoin:/a\ \ \ \ etherpad_base: \'https://$DOMAIN/etherpad/p/\'," "$MEET_CONF"
 fi
 
 echo "> Checking nginx configuration..."

files/jibri.conf

@@ -1,109 +0,0 @@
-// XMPP environment config.
-jibri {
-    streaming {
-        // A list of regex patterns for allowed RTMP URLs.  The RTMP URL used
-        // when starting a stream must match at least one of the patterns in
-        // this list.
-        rtmp-allow-list = [
-          // By default, all services are allowed
-          ".*"
-        ]
-    }
-    ffmpeg {
-        resolution = JIBRI_RES_CONF
-    }
-    chrome {
-        // The flags which will be passed to chromium when launching
-        flags = [
-          "--use-fake-ui-for-media-stream",
-          "--start-maximized",
-          "--kiosk",
-          "--enabled",
-          "--disable-infobars",
-          "--autoplay-policy=no-user-gesture-required",
-          "--ignore-certificate-errors",
-          "--disable-dev-shm-usage"
-        ]
-    }
-    stats {
-        enable-stats-d = true
-    }
-    call-status-checks {
-        // If all clients have their audio and video muted and if Jibri does not
-        // detect any data stream (audio or video) comming in, it will stop
-        // recording after NO_MEDIA_TIMEOUT expires.
-        no-media-timeout = 30 seconds
-
-        // If all clients have their audio and video muted, Jibri consideres this
-        // as an empty call and stops the recording after ALL_MUTED_TIMEOUT expires.
-        all-muted-timeout = 10 minutes
-
-        // When detecting if a call is empty, Jibri takes into consideration for how
-        // long the call has been empty already. If it has been empty for more than
-        // DEFAULT_CALL_EMPTY_TIMEOUT, it will consider it empty and stop the recording.
-        default-call-empty-timeout = 30 seconds
-    }
-    recording {
-         recordings-directory = "DIR_RECORD"
-         finalize-script = "REC_DIR"
-    }
-    api {
-        xmpp {
-            environments = [
-                {
-                // A user-friendly name for this environment
-                name = "JB_NAME"
-
-                // A list of XMPP server hosts to which we'll connect
-                xmpp-server-hosts = [ "DOMAIN" ]
-
-                // The base XMPP domain
-                xmpp-domain = "DOMAIN"
-
-                // The MUC we'll join to announce our presence for
-                // recording and streaming services
-                control-muc {
-                    domain = "internal.auth.DOMAIN"
-                    room-name = "JibriBrewery"
-                    nickname = "Live"
-                }
-
-                // The login information for the control MUC
-                control-login {
-                    domain = "auth.DOMAIN"
-                    username = "jibri"
-                    password = "JB_AUTH_PASS"
-                }
-
-                // An (optional) MUC configuration where we'll
-                // join to announce SIP gateway services
-            //    sip-control-muc {
-            //        domain = "domain"
-            //        room-name = "room-name"
-            //        nickname = "nickname"
-            //    }
-
-                // The login information the selenium web client will use
-                call-login {
-                    domain = "recorder.DOMAIN"
-                    username = "recorder"
-                    password = "JB_REC_PASS"
-                }
-
-                // The value we'll strip from the room JID domain to derive
-                // the call URL
-                strip-from-room-domain = "conference."
-
-                // How long Jibri sessions will be allowed to last before
-                // they are stopped.  A value of 0 allows them to go on
-                // indefinitely
-                usage-timeout = 0 hour
-
-                // Whether or not we'll automatically trust any cert on
-                // this XMPP domain
-                trust-all-xmpp-certs = true
-                }
-            ]
-        }
-    }
-}

grafana.sh

@@ -43,22 +43,11 @@ systemctl enable "$1"
 systemctl restart "$1"
 systemctl status "$1"
 }
-test_match() {
-    if grep -q "$1" "$2" ; then
-        echo "$(basename "$2") - OK..."
-    else
-        echo "$(basename "$2"), FAIL..."
-        echo "Please report this to https://forge.switnet.net/switnet/quick-jibri-installer"
-        exit
-    fi
-}
 MAIN_TEL="/etc/telegraf/telegraf.conf"
 TEL_JIT="/etc/telegraf/telegraf.d/jitsi.conf"
 GRAFANA_INI="/etc/grafana/grafana.ini"
 DOMAIN="$(find /etc/prosody/conf.d/ -name \*.lua|awk -F'.cfg' '!/localhost/{print $1}'|xargs basename)"
 WS_CONF="/etc/nginx/sites-available/$DOMAIN.conf"
-WS_MATCH1="# ensure all static content can always be found first"
-WS_MATCH2="upstream prosody {"
 GRAFANA_PASS="$(tr -dc "a-zA-Z0-9#_*=" < /dev/urandom | fold -w 14 | head -n1)"
 
 # Min requirements
@@ -68,17 +57,11 @@ apt-get install -y gnupg2 \
                    wget \
                    jq
 
-# Make sure we can rely on the match strings.
-printf "> Testing match strings on config files.\n"
-test_match "$WS_MATCH1" "$WS_CONF"
-
 echo "
 # Setup InfluxDB Packages
 "
-curl -s https://repos.influxdata.com/influxdata-archive.key > \
+curl -s https://repos.influxdata.com/influxdata-archive.key > /etc/apt/trusted.gpg.d/influxdata-archive.key
-    /etc/apt/trusted.gpg.d/influxdata-archive.key
+echo "deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive.key] https://repos.influxdata.com/debian buster stable" | sudo tee /etc/apt/sources.list.d/influxdb.list
-echo "deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive.key] https://repos.influxdata.com/debian buster stable" | \
-    sudo tee /etc/apt/sources.list.d/influxdb.list
 apt-get update && apt-get install influxdb -y
 run_service influxdb
 
@@ -87,8 +70,7 @@ echo "
 "
 curl -s https://apt.grafana.com/gpg-full.key | \
 gpg --dearmor | tee /etc/apt/trusted.gpg.d/grafana-full-key.gpg  >/dev/null
-echo "deb https://packages.grafana.com/oss/deb stable main" | \
+add-apt-repository "deb https://packages.grafana.com/oss/deb stable main"
-    sudo tee /etc/apt/sources.list.d/grafana_com_oss_deb.list
 apt-get update && apt-get install grafana -y
 run_service grafana-server
 
@@ -156,13 +138,11 @@ echo '
 # extra options to pass to the JVB daemon
 JVB_OPTS="--apis=rest,xmpp"' >>  /etc/jitsi/videobridge/config
 sed -i "s|TRANSPORT=muc|TRANSPORT=muc,colibri|" /etc/jitsi/videobridge/sip-communicator.properties
-# Enable videobridge REST API
-hocon -f /etc/jitsi/videobridge/jvb.conf set videobridge.apis.rest.enabled true
 systemctl restart jitsi-videobridge2
 
 echo -e "\n# Setup Grafana nginx domain\n"
 sed -i "s|;protocol =.*|protocol = http|" $GRAFANA_INI
-sed -i "s|;http_addr =.*|http_addr = 127.0.0.1|" $GRAFANA_INI
+sed -i "s|;http_addr =.*|http_addr = localhost|" $GRAFANA_INI
 sed -i "s|;http_port =.*|http_port = 3000|" $GRAFANA_INI
 sed -i "s|;domain =.*|domain = $DOMAIN|" $GRAFANA_INI
 sed -i "s|;enforce_domain =.*|enforce_domain = false|" $GRAFANA_INI
@@ -180,30 +160,10 @@ while [ $secs -gt 0 ]; do
 done
 
 if [ -f "$WS_CONF" ]; then
-    sed -i "/$WS_MATCH1/i \ \ \ \ # Proxy Grafana." "$WS_CONF"
+    sed -i "/# ensure all static content can always be found first/i \ \ \ \ location \~ \^\/(grafana\/|grafana\/login) {" "$WS_CONF"
-    sed -i "/$WS_MATCH1/i \ \ \ \ location ~ ^/(grafana/|grafana/login) {" "$WS_CONF"
+    sed -i "/# ensure all static content can always be found first/i \ \ \ \ \ \ \ \ proxy_pass http:\/\/localhost:3000;" "$WS_CONF"
-    sed -i "/$WS_MATCH1/i \ \ \ \ \ \ proxy_set_header Host \$host;" "$WS_CONF"
+    sed -i "/# ensure all static content can always be found first/i \ \ \ \ }" "$WS_CONF"
-    sed -i "/$WS_MATCH1/i \ \ \ \ \ \ proxy_pass http://grafana;" "$WS_CONF"
+    sed -i "/# ensure all static content can always be found first/i \\\n" "$WS_CONF"
-    sed -i "/$WS_MATCH1/i \ \ \ \ }" "$WS_CONF"
-    sed -i "/$WS_MATCH1/i \\\n" "$WS_CONF"
-    sed -i "/$WS_MATCH1/i \ \ \ \ # Proxy Grafana Live WebSocket connections." "$WS_CONF"
-    sed -i "/$WS_MATCH1/i \ \ \ \ location /grafana/api/live/ {" "$WS_CONF"
-    sed -i "/$WS_MATCH1/i \ \ \ \ \ \ proxy_http_version 1.1;" "$WS_CONF"
-    sed -i "/$WS_MATCH1/i \ \ \ \ \ \ proxy_set_header Upgrade \$http_upgrade;" "$WS_CONF"
-    sed -i "/$WS_MATCH1/i \ \ \ \ \ \ proxy_set_header Connection \$connection_upgrade;" "$WS_CONF"
-    sed -i "/$WS_MATCH1/i \ \ \ \ \ \ proxy_set_header Host \$host;" "$WS_CONF"
-    sed -i "/$WS_MATCH1/i \ \ \ \ \ \ proxy_pass http://grafana;" "$WS_CONF"
-    sed -i "/$WS_MATCH1/i \ \ \ \ }" "$WS_CONF"
-
-    sed -i "/$WS_MATCH2/i # This is required to proxy Grafana Live WebSocket connections." "$WS_CONF"
-    sed -i "/$WS_MATCH2/i map \$http_upgrade \$connection_upgrade {" "$WS_CONF"
-    sed -i "/$WS_MATCH2/i \ \ default upgrade;" "$WS_CONF"
-    sed -i "/$WS_MATCH2/i \ \ '' close;" "$WS_CONF"
-    sed -i "/$WS_MATCH2/i }" "$WS_CONF"
-    sed -i "/$WS_MATCH1/i \\\n" "$WS_CONF"
-    sed -i "/$WS_MATCH2/i upstream grafana {" "$WS_CONF"
-    sed -i "/$WS_MATCH2/i \ \ server localhost:3000;" "$WS_CONF"
-    sed -i "/$WS_MATCH2/i }" "$WS_CONF"
     systemctl restart nginx
 else
     echo "No app configuration done to server file, please report to:
@@ -219,7 +179,7 @@ PUT -H "Content-Type: application/json;charset=UTF-8" -d \
   \"oldPassword\": \"admin\",
   \"newPassword\": \"$GRAFANA_PASS\",
   \"confirmNew\": \"$GRAFANA_PASS\"
-}" http://127.0.0.1:3000/api/user/password; echo ""
+}" http://localhost:3000/api/user/password; echo ""
 
 echo "
 # Create InfluxDB datasource
@@ -229,16 +189,16 @@ POST -H 'Content-Type: application/json;charset=UTF-8' -d \
 '{
     "name": "InfluxDB",
     "type": "influxdb",
-    "url": "http://127.0.0.1:8086",
+    "url": "http://localhost:8086",
     "access": "proxy",
     "isDefault": true,
     "database": "jitsi"
-}' http://127.0.0.1:3000/api/datasources; echo ""
+}' http://localhost:3000/api/datasources; echo ""
 
 echo "
 # Add Grafana Dashboard
 "
-grafana_host="http://127.0.0.1:3000"
+grafana_host="http://localhost:3000"
 grafana_cred="admin:$GRAFANA_PASS"
 grafana_datasource="InfluxDB"
 ds=(11969);

images/watermark2.svg

@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="1" height="1"/>

jigasi-vosk-backend.sh

@@ -1,128 +0,0 @@
-#!/bin/bash
-# Quick Jigasi Installer with VOSK backend - *buntu (LTS) based systems.
-# SwITNet Ltd © - 2024, https://switnet.net/
-# GPLv3 or later.
-
-#Check if user is root
-if ! [ "$(id -u)" = 0 ]; then
-   echo "You need to be root or have sudo privileges!"
-   exit 0
-fi
-exit_if_not_installed() {
-if [ "$(dpkg-query -W -f='${Status}' "$1" 2>/dev/null | grep -c "ok installed")" != "1" ]; then
-    echo " This instance doesn't have $1 installed, exiting..."
-    echo " If you think this is an error, please report to:
-    -> https://forge.switnet.net/switnet/quick-jibri-installer/issues "
-    exit
-fi
-}
-
-clear
-echo ''
-echo '########################################################################'
-echo '                       Jigasi Transcript addon'
-echo '########################################################################'
-echo '                    by Software, IT & Networks Ltd'
-echo ''
-
-exit_if_not_installed jitsi-meet
-
-DOMAIN="$(find /etc/prosody/conf.d/ -name \*.lua|awk -F'.cfg' '!/localhost/{print $1}'|xargs basename)"
-JIG_TRANSC_PASWD="$(tr -dc "a-zA-Z0-9#*=" < /dev/urandom | fold -w 16 | head -n1)"
-JIG_SIP_PROP="/etc/jitsi/jigasi/sip-communicator.properties"
-export DOMAIN
-export JIG_TRANSC_PASWD
-
-apt-get -q2 update
-
-# Disable SIP account prompt by default
-echo "jigasi	jigasi/sip-account	string	''" | debconf-set-selections
-echo "jigasi	jigasi/sip-password	password	''" | debconf-set-selections
-
-echo "Installing Jigasi, SIP configuration disabled by default."
-apt-get -y install gettext-base jigasi docker.io
-
-echo "Please select a language for the VOSK transcription model:"
-echo "1) Chinese"
-echo "2) English"
-echo "3) French"
-echo "4) German"
-echo "5) Hindi"
-echo "6) Japanese"
-echo "7) Russian"
-echo "8) Spanish"
-
-read -p "Enter the number corresponding to your language choice: " -r lang_choice
-
-case $lang_choice in
-    1)
-        echo "You selected Chinese."
-        VOSK_DOCKER_MODEL="alphacep/kaldi-cn"
-        ;;
-    2)
-        echo "You selected English."
-        VOSK_DOCKER_MODEL="alphacep/kaldi-en"
-        ;;
-    3)
-        echo "You selected French."
-        VOSK_DOCKER_MODEL="alphacep/kaldi-fr"
-        ;;
-    4)
-        echo "You selected German."
-        VOSK_DOCKER_MODEL="alphacep/kaldi-de"
-        ;;
-    5)
-        echo "You selected Hindi."
-        VOSK_DOCKER_MODEL="alphacep/kaldi-hi"
-        ;;
-    6)
-        echo "You selected Japanese."
-        VOSK_DOCKER_MODEL="alphacep/kaldi-ja"
-        ;;
-    7)
-        echo "You selected Russian."
-        VOSK_DOCKER_MODEL="alphacep/kaldi-ru"
-        ;;
-    8)
-        echo "You selected Spanish."
-        VOSK_DOCKER_MODEL="alphacep/kaldi-es"
-        ;;
-    *)
-        echo "Invalid selection. Please choose a number between 1 and 8."
-        ;;
-esac
-
-# Running selected VOSK docker model.
-docker run -d --restart always -p 2700:2700 ${VOSK_DOCKER_MODEL}:latest
-
-echo "Setting up Jigasi transcript with current platform..."
-
-# Jitsi Meet
-echo "> Patching Jitsi Meet's config.js for Transcription support."
-echo "  Read more at patches/jigasi/001-jigasi-meet-config.patch file"
-envsubst < patches/jigasi/001-jigasi-meet-config.patch | \
-  patch --no-backup-if-mismatch -d / -p1
-
-# Jigasi
-echo "> Patching jigasi's sip-communicator.properties configuration."
-echo "  Read more at patches/jigasi/002-jigasi-sip-properties.patch file"
-cp "$JIG_SIP_PROP" ${JIG_SIP_PROP}-dpkg-file
-envsubst < patches/jigasi/002-jigasi-sip-properties.patch | \
-  patch --no-backup-if-mismatch -d / -p1
-
-# Create transcribe user on hidden domain.
-prosodyctl register transcriber recorder."$DOMAIN" "$JIG_TRANSC_PASWD"
-
-# Restart services.
-systemctl restart prosody \
-                  jicofo \
-                  jigasi \
-                  jibri* \
-                  jitsi-videobridge2
-
-echo ""
-echo "Full transcript files are available at:"
-echo "--> /var/lib/jigasi/transcripts/"
-echo ""
-echo "Happy transcripting!"
-echo ""

jm-bm.sh

@@ -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.svg"
 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,10 +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"
-#Overwrite favicon svg
-cp images/watermark2.svg $JM_IMG_PATH/favicon.svg
 
 #Customize room title
 sed -i "s|Jitsi Meet|$APP_NAME|g" "$TITLE_FILE"

jra_nextcloud.sh

@@ -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  ')"
 

patches/jigasi/001-jigasi-meet-config.patch

@@ -1,40 +0,0 @@
-# Quick Jigasi Installer with VOSK backend - *buntu (LTS) based systems.
-# SwITNet Ltd © - 2024, https://switnet.net/
-# GPLv3 or later.
-
-Enable transcription on jitsi meet config.js file.
-
-diff --git a/etc/jitsi/meet/${DOMAIN}-config.js b/etc/jitsi/meet/${DOMAIN}-config.js
-index f412891..f704157 100644
---- a/etc/jitsi/meet/${DOMAIN}-config.js
-+++ b/etc/jitsi/meet/${DOMAIN}-config.js
-@@ -426,9 +426,9 @@ var config = {
-     // autoCaptionOnRecord: false,
- 
-     // Transcription options.
--    // transcription: {
-+    transcription: {
-     //     // Whether the feature should be enabled or not.
--    //     enabled: false,
-+        enabled: true,
- 
-     //     // Translation languages.
-     //     // Available languages can be found in
-@@ -443,7 +443,7 @@ var config = {
-     //     // detected based on the environment, e.g. if the app is opened in a chrome instance which
-     //     // is using french as its default language then transcriptions for that participant will be in french.
-     //     // Defaults to true.
--    //     useAppLanguage: true,
-+        useAppLanguage: true,
- 
-     //     // Transcriber language. This settings will only work if "useAppLanguage"
-     //     // is explicitly set to false.
-@@ -453,7 +453,7 @@ var config = {
- 
-     //     // Enables automatic turning on transcribing when recording is started
-     //     autoTranscribeOnRecord: false,
--    // },
-+    },
- 
-     // Misc
- 

patches/jigasi/002-jigasi-sip-properties.patch

@@ -1,80 +0,0 @@
-# Quick Jigasi Installer with VOSK backend - *buntu (LTS) based systems.
-# SwITNet Ltd © - 2024, https://switnet.net/
-# GPLv3 or later.
-
-Modify sip-communicator.properties to run Jigasi along with VOSK Models.
-
-diff --git a/etc/jitsi/jigasi/sip-communicator.properties b/etc/jitsi/jigasi/sip-communicator.properties
-index 7a8d0f3..ae5369a 100644
---- a/etc/jitsi/jigasi/sip-communicator.properties
-+++ b/etc/jitsi/jigasi/sip-communicator.properties
-@@ -165,12 +165,12 @@ org.jitsi.jigasi.xmpp.acc.USE_DEFAULT_STUN_SERVER=false
- 
- # If you want jigasi to perform authenticated login instead of anonymous login
- # to the XMPP server, you can set the following properties.
--# org.jitsi.jigasi.xmpp.acc.USER_ID=SOME_USER@SOME_DOMAIN
--# org.jitsi.jigasi.xmpp.acc.PASS=SOME_PASS
--# org.jitsi.jigasi.xmpp.acc.ANONYMOUS_AUTH=false
-+org.jitsi.jigasi.xmpp.acc.USER_ID=transcriber@recorder.${DOMAIN}
-+org.jitsi.jigasi.xmpp.acc.PASS=${JIG_TRANSC_PASWD}
-+org.jitsi.jigasi.xmpp.acc.ANONYMOUS_AUTH=false
- 
- # To fix SSL/TLS required by client but not supported by server
--#org.jitsi.jigasi.xmpp.acc.ALLOW_NON_SECURE=true
-+org.jitsi.jigasi.xmpp.acc.ALLOW_NON_SECURE=true
- 
- # Can be used in combination with jitsi-meet module mod_auth_jitsi-shared-secret
- # To have jigasi use a random username on every call
-@@ -187,7 +187,7 @@ org.jitsi.jigasi.xmpp.acc.USE_DEFAULT_STUN_SERVER=false
- # Activate this property if you are using self-signed certificates or other
- # type of non-trusted certicates. In this mode your service trust in the
- # remote certificates always.
--# net.java.sip.communicator.service.gui.ALWAYS_TRUST_MODE_ENABLED=true
-+net.java.sip.communicator.service.gui.ALWAYS_TRUST_MODE_ENABLED=true
- 
- # Enable this property to be able to shutdown gracefully jigasi using
- # a rest command
-@@ -196,31 +196,31 @@ org.jitsi.jigasi.xmpp.acc.USE_DEFAULT_STUN_SERVER=false
- # Options regarding Transcription. Read the README for a detailed description
- # about each property
- 
--#org.jitsi.jigasi.ENABLE_TRANSCRIPTION=false
--#org.jitsi.jigasi.ENABLE_SIP=true
-+org.jitsi.jigasi.ENABLE_TRANSCRIPTION=true
-+org.jitsi.jigasi.ENABLE_SIP=false
- 
- # whether to use the more expensive, but better performing
- # "video" model when doing transcription
- # org.jitsi.jigasi.transcription.USE_VIDEO_MODEL = false
- 
- # delivering final transcript
--# org.jitsi.jigasi.transcription.DIRECTORY=/var/lib/jigasi/transcripts
--# org.jitsi.jigasi.transcription.BASE_URL=http://localhost/
--# org.jitsi.jigasi.transcription.jetty.port=-1
--# org.jitsi.jigasi.transcription.ADVERTISE_URL=false
-+org.jitsi.jigasi.transcription.DIRECTORY=/var/lib/jigasi/transcripts
-+org.jitsi.jigasi.transcription.BASE_URL=http://localhost/
-+org.jitsi.jigasi.transcription.jetty.port=-1
-+org.jitsi.jigasi.transcription.ADVERTISE_URL=false
- 
- # save formats
--# org.jitsi.jigasi.transcription.SAVE_JSON=false
--# org.jitsi.jigasi.transcription.SAVE_TXT=true
-+org.jitsi.jigasi.transcription.SAVE_JSON=false
-+org.jitsi.jigasi.transcription.SAVE_TXT=true
- 
- # send formats
--# org.jitsi.jigasi.transcription.SEND_JSON=true
--# org.jitsi.jigasi.transcription.SEND_TXT=false
-+org.jitsi.jigasi.transcription.SEND_JSON=true
-+org.jitsi.jigasi.transcription.SEND_TXT=false
- 
- # Vosk server
--# org.jitsi.jigasi.transcription.customService=org.jitsi.jigasi.transcription.VoskTranscriptionService
-+org.jitsi.jigasi.transcription.customService=org.jitsi.jigasi.transcription.VoskTranscriptionService
- # org.jitsi.jigasi.transcription.vosk.websocket_url={"en": "ws://localhost:2700", "fr": "ws://localhost:2710"}
--# org.jitsi.jigasi.transcription.vosk.websocket_url=ws://localhost:2700
-+org.jitsi.jigasi.transcription.vosk.websocket_url=ws://localhost:2700
- 
- # Whisper live transcription server
- # org.jitsi.jigasi.transcription.customService=org.jitsi.jigasi.transcription.WhisperTranscriptionService

patches/jitsi-meet/001-jitsi-meet-enable-livestreaming-and-recording.patch

@@ -1,66 +0,0 @@
-# Quick Jibri Installer - *buntu (LTS) based systems.
-# SwITNet Ltd © - 2024, https://switnet.net/
-# GPLv3 or later.
-
-Patch jitsi-meet config.js to enable recording and livestreaming by default.
-
-diff --git a/etc/jitsi/meet/${DOMAIN}-config.js b/etc/jitsi/meet/${DOMAIN}-config.js
-index dcb860b..8f64c7c 100644
---- a/etc/jitsi/meet/${DOMAIN}-config.js
-+++ b/etc/jitsi/meet/${DOMAIN}-config.js
-@@ -343,12 +343,12 @@ var config = {
-     //    // showPrejoinWarning: true,
-     // },
- 
--    // recordingService: {
-+    recordingService: {
-     //     // When integrations like dropbox are enabled only that will be shown,
-     //     // by enabling fileRecordingsServiceEnabled, we show both the integrations
-     //     // and the generic recording service (its configuration and storage type
-     //     // depends on jibri configuration)
--    //     enabled: false,
-+        enabled: true,
- 
-     //     // Whether to show the possibility to share file recording with other people
-     //     // (e.g. meeting participants), based on the actual implementation
-@@ -357,7 +357,7 @@ var config = {
- 
-     //     // Hide the warning that says we only store the recording for 24 hours.
-     //     hideStorageWarning: false,
--    // },
-+    },
- 
-     // DEPRECATED. Use recordingService.enabled instead.
-     // fileRecordingsServiceEnabled: false,
-@@ -368,7 +368,7 @@ var config = {
-     // Local recording configuration.
-     // localRecording: {
-     //     // Whether to disable local recording or not.
--    //     disable: false,
-+    //     disable: true,
- 
-     //     // Whether to notify all participants when a participant is recording locally.
-     //     notifyAllParticipants: false,
-@@ -378,9 +378,9 @@ var config = {
-     // },
- 
-     // Customize the Live Streaming dialog. Can be modified for a non-YouTube provider.
--    // liveStreaming: {
-+    liveStreaming: {
-     //    // Whether to enable live streaming or not.
--    //    enabled: false,
-+       enabled: true,
-     //    // Terms link
-     //    termsLink: 'https://www.youtube.com/t/terms',
-     //    // Data privacy link
-@@ -388,8 +388,8 @@ var config = {
-     //    // RegExp string that validates the stream key input field
-     //    validatorRegExpString: '^(?:[a-zA-Z0-9]{4}(?:-(?!$)|$)){4}',
-     //    // Documentation reference for the live streaming feature.
--    //    helpLink: 'https://jitsi.org/live'
--    // },
-+       helpLink: 'https://forge.switnet.net/switnet/quick-jibri-installer'
-+    },
- 
-     // DEPRECATED. Use liveStreaming.enabled instead.
-     // liveStreamingEnabled: false,

patches/jitsi-meet/002-jitsi-meet-welcome-page-on-off.patch

@@ -1,31 +0,0 @@
-# Quick Jibri Installer - *buntu (LTS) based systems.
-# SwITNet Ltd © - 2024, https://switnet.net/
-# GPLv3 or later.
-
-Patch jitsi-meet config.js to enable/disable welcome page.
-
-diff --git a/etc/jitsi/meet/${DOMAIN}-config.js b/etc/jitsi/meet/${DOMAIN}-config.js
-index dcb860b..2094287 100644
---- a/etc/jitsi/meet/${DOMAIN}-config.js
-+++ b/etc/jitsi/meet/${DOMAIN}-config.js
-@@ -664,13 +664,13 @@ var config = {
-     // enableWelcomePage: true,
- 
-     // Configs for welcome page.
--    // welcomePage: {
--    //     // Whether to disable welcome page. In case it's disabled a random room
--    //     // will be joined when no room is specified.
--    //     disabled: false,
--    //     // If set, landing page will redirect to this URL.
--    //     customUrl: ''
--    // },
-+    welcomePage: {
-+        // Whether to disable welcome page. In case it's disabled a random room
-+        // will be joined when no room is specified.
-+        disabled: ${ENABLE_WELCP_BOL},
-+        // If set, landing page will redirect to this URL.
-+        customUrl: ''
-+    },
- 
-     // Configs for the lobby screen.
-     // lobby: {

quick_jibri_installer.sh

@@ -538,20 +538,19 @@ JB_NAME="Jibri Sessions"
 LE_RENEW_LOG="/var/log/letsencrypt/renew.log"
 MOD_LISTU="https://prosody.im/files/mod_listusers.lua"
 MOD_LIST_FILE="/usr/lib/prosody/modules/mod_listusers.lua"
+ENABLE_SA="yes"
 MJS_RAND_TAIL="$(tr -dc "a-zA-Z0-9" < /dev/urandom | fold -w 4 | head -n1)"
 MJS_USER="jbsync_$MJS_RAND_TAIL"
 MJS_USER_PASS="$(tr -dc "a-zA-Z0-9#_*=" < /dev/urandom | fold -w 32 | head -n1)"
 FQDN_HOST="fqdn"
 JIBRI_XORG_CONF="/etc/jitsi/jibri/xorg-video-dummy.conf"
 WS_MATCH1="# ensure all static content can always be found first"
-WS_MATCH2="external_api.js"
 MEET_MATCH1="disable simulcast support."
-export DOMAIN
+#GC_SDK_REL_FILE="http://packages.cloud.google.com/apt/dists/cloud-sdk-$(lsb_release -sc)/Release"
 
 # Make sure we can rely on the match strings.
 printf "> Testing match strings on config files.\n"
 test_match "$WS_MATCH1" "$WS_CONF"
-test_match "$WS_MATCH2" "$WS_CONF"
 test_match "$MEET_MATCH1" "$MEET_CONF"
 
 # Rename hostname for jitsi server
@@ -568,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
@@ -700,16 +711,24 @@ do
 done
 sleep .1
 ##Jigasi
-while [ "$ENABLE_TRANSCRIPT" != "yes" ] && [ "$ENABLE_TRANSCRIPT" != "no" ]
+#if [ "$(curl -s -o /dev/null -w "%{http_code}" "$GC_SDK_REL_FILE" )" == "404" ]; then
-do
+    #printf "> Sorry Google SDK doesn't have support yet for %s,
-    read -p "> Do you want to setup Jigasi Transcription: (yes or no)
+    #thus, Jigasi Transcript can't be enable.\n\n" "$(lsb_release -sd)"
+#elif [ "$(curl -s -o /dev/null -w "%{http_code}" "$GC_SDK_REL_FILE" )" == "200" ]; then
+    #while [ "$ENABLE_TRANSCRIPT" != "yes" ] && [ "$ENABLE_TRANSCRIPT" != "no" ]
+    #do
+        #read -p "> Do you want to setup Jigasi Transcription: (yes or no)
 #( Please check requirements at: https://forge.switnet.net/switnet/quick-jibri-installer )$NL" -r ENABLE_TRANSCRIPT
-    if [ "$ENABLE_TRANSCRIPT" = "no" ]; then
+        #if [ "$ENABLE_TRANSCRIPT" = "no" ]; then
-        printf " - Jigasi Transcription won't be enabled.\n\n"
+            #printf " - Jigasi Transcription won't be enabled.\n\n"
-    elif [ "$ENABLE_TRANSCRIPT" = "yes" ]; then
+        #elif [ "$ENABLE_TRANSCRIPT" = "yes" ]; then
-        printf " - Jigasi Transcription will be enabled.\n\n"
+            #printf " - Jigasi Transcription will be enabled.\n\n"
-    fi
+        #fi
-done
+    #done
+#else
+    #echo "No valid option for Jigasi. Please report this to
+#https://forge.switnet.net/switnet/quick-jibri-installer/issues"
+#fi
 sleep .1
 #Grafana
 while [ "$ENABLE_GRAFANA_DSH" != "yes" ] && [ "$ENABLE_GRAFANA_DSH" != "no" ]
@@ -853,17 +872,23 @@ BREWERY
 
 # Jibri tweaks for /etc/jitsi/meet/$DOMAIN-config.js
 sed -i "s|conference.$DOMAIN|internal.auth.$DOMAIN|" "$MEET_CONF"
+#New recording implementation.
+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 "s|// liveStreamingEnabled: false,|liveStreamingEnabled: true,\\
+\\
+    hiddenDomain: \'recorder.$DOMAIN\',|" "$MEET_CONF"
 
-#Enable recording & livestreaming by default.
+#Setup main language
-echo "> Patching config.js to enable recording and livestreaming by default..."
+if [ -z "$JB_LANG" ] || [ "$JB_LANG" = "en" ]; then
-echo "  Read more about patches at the patches folder."
+    echo "Leaving English (en) as default language..."
-envsubst < \
+    sed -i "s|// defaultLanguage: 'en',|defaultLanguage: 'en',|" "$MEET_CONF"
-  patches/jitsi-meet/001-jitsi-meet-enable-livestreaming-and-recording.patch | \
+else
-  patch --no-backup-if-mismatch -d / -p1
+    echo "Changing default language to: $JB_LANG"
+    sed -i "s|// defaultLanguage: 'en',|defaultLanguage: \'$JB_LANG\',|" "$MEET_CONF"
+fi
 
-#Prepare hidden domain for jibri/jigasi silent users.
-sed -i "/fileRecordingsServiceEnabled: false,/a \\
-    hiddenDomain: \'recorder.$DOMAIN\'," "$MEET_CONF"
 # Recording directory
 if [ ! -d "$DIR_RECORD" ]; then
     mkdir "$DIR_RECORD"
@@ -882,8 +907,8 @@ echo "or storage provider, etc.) in this script" >> /tmp/finalize.out
 
 chmod -R 770 \$RECORDINGS_DIR
 
-LJF_PATH="\$(find \$RECORDINGS_DIR -exec stat --printf="%Y\t%n\n" {} \; | sort -nr|sed 1d|awk '{print\$2}'| grep -v "meta\|_" | head -n1)"
+LJF_PATH="\$(find \$RECORDINGS_DIR -exec stat --printf="%Y\t%n\n" {} \; | sort -n -r|awk '{print\$2}'| grep -v "meta\|-" | head -n1)"
-NJF_NAME="\$(find \$LJF_PATH |grep "mp4"|sed "s|\$LJF_PATH/||"|cut -d "." -f1)"
+NJF_NAME="\$(find \$LJF_PATH |grep -e "-"|sed "s|\$LJF_PATH/||"|cut -d "." -f1)"
 NJF_PATH="\$RECORDINGS_DIR/\$NJF_NAME"
 mv \$LJF_PATH \$NJF_PATH
 
@@ -894,15 +919,117 @@ chmod +x "$REC_DIR"
 
 ## New Jibri Config (2020)
 mv "$JIBRI_CONF" ${JIBRI_CONF}-dpkg-file
-cp files/jibri.conf "$JIBRI_CONF"
+cat << NEW_CONF > "$JIBRI_CONF"
-sed -i "s|JIBRI_RES_CONF|$JIBRI_RES_CONF|g" "$JIBRI_CONF"
+// New XMPP environment config.
-sed -i "s|DIR_RECORD|$DIR_RECORD|g" "$JIBRI_CONF"
+jibri {
-sed -i "s|REC_DIR|$REC_DIR|g" "$JIBRI_CONF"
+    streaming {
-sed -i "s|JB_NAME|$JB_NAME|g" "$JIBRI_CONF"
+        // A list of regex patterns for allowed RTMP URLs.  The RTMP URL used
-sed -i "s|DOMAIN|$DOMAIN|g" "$JIBRI_CONF"
+        // when starting a stream must match at least one of the patterns in
-sed -i "s|JibriBrewery|$JibriBrewery|g" "$JIBRI_CONF"
+        // this list.
-sed -i "s|JB_AUTH_PASS|$JB_AUTH_PASS|g" "$JIBRI_CONF"
+        rtmp-allow-list = [
-sed -i "s|JB_REC_PASS|$JB_REC_PASS|g" "$JIBRI_CONF"
+          // By default, all services are allowed
+          ".*"
+        ]
+    }
+    ffmpeg {
+        resolution = $JIBRI_RES_CONF
+    }
+    chrome {
+        // The flags which will be passed to chromium when launching
+        flags = [
+          "--use-fake-ui-for-media-stream",
+          "--start-maximized",
+          "--kiosk",
+          "--enabled",
+          "--disable-infobars",
+          "--autoplay-policy=no-user-gesture-required",
+          "--ignore-certificate-errors",
+          "--disable-dev-shm-usage"
+        ]
+    }
+    stats {
+        enable-stats-d = true
+    }
+    call-status-checks {
+        // If all clients have their audio and video muted and if Jibri does not
+        // detect any data stream (audio or video) comming in, it will stop
+        // recording after NO_MEDIA_TIMEOUT expires.
+        no-media-timeout = 30 seconds
+
+        // If all clients have their audio and video muted, Jibri consideres this
+        // as an empty call and stops the recording after ALL_MUTED_TIMEOUT expires.
+        all-muted-timeout = 10 minutes
+
+        // When detecting if a call is empty, Jibri takes into consideration for how
+        // long the call has been empty already. If it has been empty for more than
+        // DEFAULT_CALL_EMPTY_TIMEOUT, it will consider it empty and stop the recording.
+        default-call-empty-timeout = 30 seconds
+    }
+    recording {
+         recordings-directory = "$DIR_RECORD"
+         finalize-script = "$REC_DIR"
+    }
+    api {
+        xmpp {
+            environments = [
+                {
+                // A user-friendly name for this environment
+                name = "$JB_NAME"
+
+                // A list of XMPP server hosts to which we'll connect
+                xmpp-server-hosts = [ "$DOMAIN" ]
+
+                // The base XMPP domain
+                xmpp-domain = "$DOMAIN"
+
+                // The MUC we'll join to announce our presence for
+                // recording and streaming services
+                control-muc {
+                    domain = "internal.auth.$DOMAIN"
+                    room-name = "$JibriBrewery"
+                    nickname = "Live"
+                }
+
+                // The login information for the control MUC
+                control-login {
+                    domain = "auth.$DOMAIN"
+                    username = "jibri"
+                    password = "$JB_AUTH_PASS"
+                }
+
+                // An (optional) MUC configuration where we'll
+                // join to announce SIP gateway services
+            //    sip-control-muc {
+            //        domain = "domain"
+            //        room-name = "room-name"
+            //        nickname = "nickname"
+            //    }
+
+                // The login information the selenium web client will use
+                call-login {
+                    domain = "recorder.$DOMAIN"
+                    username = "recorder"
+                    password = "$JB_REC_PASS"
+                }
+
+                // The value we'll strip from the room JID domain to derive
+                // the call URL
+                strip-from-room-domain = "conference."
+
+                // How long Jibri sessions will be allowed to last before
+                // they are stopped.  A value of 0 allows them to go on
+                // indefinitely
+                usage-timeout = 0 hour
+
+                // Whether or not we'll automatically trust any cert on
+                // this XMPP domain
+                trust-all-xmpp-certs = true
+                }
+            ]
+        }
+    }
+}
+NEW_CONF
 
 #Jibri xorg resolution
 sed -i "s|[[:space:]]Virtual .*|Virtual $JIBRI_RES_XORG_CONF|" "$JIBRI_XORG_CONF"
@@ -977,6 +1104,28 @@ sed -i "s|MJS_USER=.*|MJS_USER=\"$MJS_USER\"|" add-jvb2-node.sh
 sed -i "s|MJS_USER_PASS=.*|MJS_USER_PASS=\"$MJS_USER_PASS\"|" add-jvb2-node.sh
 ##--
 
+#Tune webserver for Jitsi App control
+if [ -f "$WS_CONF" ]; then
+    sed -i "/$WS_MATCH1/i \\\n" "$WS_CONF"
+    sed -i "/$WS_MATCH1/i \ \ \ \ location = \/external_api.min.js {" "$WS_CONF"
+    sed -i "/$WS_MATCH1/i \ \ \ \ \ \ \ \ alias \/usr\/share\/jitsi-meet\/libs\/external_api.min.js;" "$WS_CONF"
+    sed -i "/$WS_MATCH1/i \ \ \ \ }" "$WS_CONF"
+    sed -i "/$WS_MATCH1/i \\\n" "$WS_CONF"
+    systemctl reload nginx
+else
+    echo "No app configuration done to server file, please report to:"
+    echo "  -> https://forge.switnet.net/switnet/quick-jibri-installer/issues"
+fi
+#Static avatar
+if [ "$ENABLE_SA" = "yes" ] && [ -f "$WS_CONF" ]; then
+    cp images/avatar2.png /usr/share/jitsi-meet/images/
+    sed -i "/location \/external_api.min.js/i \ \ \ \ location \~ \^\/avatar\/\(.\*\)\\\.png {" "$WS_CONF"
+    sed -i "/location \/external_api.min.js/i \ \ \ \ \ \ \ \ alias /usr/share/jitsi-meet/images/avatar2.png;" "$WS_CONF"
+    sed -i "/location \/external_api.min.js/i \ \ \ \ }\\
+\ " "$WS_CONF"
+    sed -i "/RANDOM_AVATAR_URL_PREFIX/ s|false|\'https://$DOMAIN/avatar/\'|" "$INT_CONF"
+    sed -i "/RANDOM_AVATAR_URL_SUFFIX/ s|false|\'.png\'|" "$INT_CONF"
+fi
 #nginx -tlsv1/1.1
 if [ "$DROP_TLS1" = "yes" ];then
     printf "\nDropping TLSv1/1.1\n\n"
@@ -1044,23 +1193,20 @@ fi
 sed -i "s|// startWithVideoMuted: false,|startWithVideoMuted: true,|" "$MEET_CONF"
 
 #Start with audio muted but admin
-sed -i "s|// startAudioMuted: 10,|startAudioMuted: 2,|" "$MEET_CONF"
+sed -i "s|// startAudioMuted: 10,|startAudioMuted: 1,|" "$MEET_CONF"
 
 #Disable/enable welcome page
-[ "$ENABLE_WELCP" = "yes" ] && ENABLE_WELCP_BOL=true
+if [ "$ENABLE_WELCP" = "yes" ]; then
-[ "$ENABLE_WELCP" = "no" ] && ENABLE_WELCP_BOL=false
+    sed -i "s|.*enableWelcomePage:.*|    enableWelcomePage: false,|" "$MEET_CONF"
-export ENABLE_WELCP_BOL
+elif [ "$ENABLE_WELCP" = "no" ]; then
-echo "> Patching config.js to modify welcompage behavior..."
+    sed -i "s|.*enableWelcomePage:.*|    enableWelcomePage: true,|" "$MEET_CONF"
-echo "  Read more about patches at the patches folder."
+fi
-envsubst < \
-  patches/jitsi-meet/002-jitsi-meet-welcome-page-on-off.patch | \
-  patch --no-backup-if-mismatch -d / -p1
-
 #Enable close page
-[ "$ENABLE_CLOCP" = "yes" ] && \
+if [ "$ENABLE_CLOCP" = "yes" ]; then
-    sed -i "s|// enableClosePage:.*|enableClosePage: true,|" "$MEET_CONF"
+    sed -i "s|.*enableClosePage:.*|    enableClosePage: true,|" "$MEET_CONF"
-[ "$ENABLE_CLOCP" = "no" ] && \
+elif [ "$ENABLE_CLOCP" = "no" ]; then
-    sed -i "s|// enableClosePage:.*|enableClosePage: false,|" "$MEET_CONF"
+    sed -i "s|.*enableClosePage:.*|    enableClosePage: false,|" "$MEET_CONF"
+fi
 
 #Add pre-join screen by default, since it improves YouTube autoplay capabilities
 #pre-join screen by itself don't require autorization by moderator, don't confuse with lobby which does.
@@ -1162,16 +1308,7 @@ if [ "$ENABLE_NC_ACCESS" = "yes" ]; then
     fi
 fi
 sleep .1
-#Jigasi w/VOSK backend.
+
-if [ "$ENABLE_TRANSCRIPT" = "yes" ]; then
-    printf "\nJigasi with VOSK backend will be enabled."
-    if [ "$MODE" = "debug" ]; then
-        bash "$PWD"/jigasi-vosk-backend.sh -m debug
-    else
-        bash "$PWD"/jigasi-vosk-backend.sh
-    fi
-fi
-sleep .1
 #Grafana Dashboard
 if [ "$ENABLE_GRAFANA_DSH" = "yes" ]; then
     printf "\nGrafana Dashboard will be enabled."