From 1bd3f86cc41bf9cb94eed6f3d503329ca6de5850 Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Tue, 15 Nov 2022 02:58:25 -0600
Subject: [PATCH 01/19] bump version 7.0.8

---
 changelog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/changelog b/changelog
index b2a5305..c0a3392 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 quick-jibri-installer (7.2.1)
 
     * changelog: update previous version.

From c633c111498bbbd11fadd06d56b0376783db5e35 Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Wed, 22 Feb 2023 03:54:21 -0600
Subject: [PATCH 02/19] jra_nextcloud.sh: fix key agregation and variable
 collection.

---
 jra_nextcloud.sh | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/jra_nextcloud.sh b/jra_nextcloud.sh
index f379213..30aa97c 100644
--- a/jra_nextcloud.sh
+++ b/jra_nextcloud.sh
@@ -51,7 +51,7 @@ PHP_FPM_DIR="/etc/php/$PHPVER/fpm"
 PHP_INI="$PHP_FPM_DIR/php.ini"
 PHP_CONF="/etc/php/$PHPVER/fpm/pool.d/www.conf"
 NC_NGINX_SSL_PORT="$(grep "listen 44" /etc/nginx/sites-available/"$DOMAIN".conf | awk '{print$2}')"
-[ -z $NC_NGINX_SSL_PORT ] && NC_NGINX_SSL_PORT="443"
+[ -z "$NC_NGINX_SSL_PORT" ] && NC_NGINX_SSL_PORT="443"
 NC_REPO="https://download.nextcloud.com/server/releases"
 NCVERSION="$(curl -s -m 900 $NC_REPO/ | sed --silent 's/.*href="nextcloud-\([^"]\+\).zip.asc".*/\1/p' | sort --version-sort | tail -1)"
 STABLEVERSION="nextcloud-$NCVERSION"
@@ -63,7 +63,6 @@ NC_DB_PASSWD="$(tr -dc "a-zA-Z0-9#_*=" < /dev/urandom | fold -w 14 | head -n1)"
 DIR_RECORD="$(awk  -F '"' '/RECORDING/{print$2}'  /home/jibri/finalize_recording.sh|awk 'NR==1{print$1}')"
 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 +short myip.opendns.com @resolver1.opendns.com)"
 ISO3166_CODE=TBD
@@ -79,7 +78,7 @@ mv "$TMP_GPG_REPO"/"$1".gpg /etc/apt/trusted.gpg.d/
 install_aval_package() {
 for i in $1
   do
-     if [ -z "$(apt-cache madison $i 2>/dev/null)" ]; then
+     if [ -z "$(apt-cache madison "$i" 2>/dev/null)" ]; then
      echo " > Package $i not available on repo."
      else
      echo " > Add package $i to the install list"
@@ -159,7 +158,7 @@ done
 while [ -z "$NC_PASS" ]  || [ ${#NC_PASS} -lt 8 ]
 do
     read -p "Nextcloud user password: " -r NC_PASS
-    if [ -z "$NC_PASS" ] || [ ${#NC_PASS} -lt8 ]; then
+    if [ -z "$NC_PASS" ] || [ ${#NC_PASS} -lt 8 ]; then
         echo -e " - This field is mandatory. \nPlease make sure it's at least 8 characters.\n"
     fi
 done
@@ -215,23 +214,23 @@ install_ifnot postgresql-"$PSGVER"
 add_php
 install_aval_package " \
             imagemagick \
-            php"$PHPVER"-fpm \
-            php"$PHPVER"-bcmath \
-            php"$PHPVER"-bz2 \
-            php"$PHPVER"-curl \
-            php"$PHPVER"-gd \
-            php"$PHPVER"-gmp \
-            php"$PHPVER"-imagick \
-            php"$PHPVER"-intl \
-            php"$PHPVER"-json \
-            php"$PHPVER"-ldap \
-            php"$PHPVER"-mbstring \
-            php"$PHPVER"-pgsql \
-            php"$PHPVER"-redis \
-            php"$PHPVER"-soap \
-            php"$PHPVER"-xml \
-            php"$PHPVER"-xmlrpc \
-            php"$PHPVER"-zip \
+            php$PHPVER-fpm \
+            php$PHPVER-bcmath \
+            php$PHPVER-bz2 \
+            php$PHPVER-curl \
+            php$PHPVER-gd \
+            php$PHPVER-gmp \
+            php$PHPVER-imagick \
+            php$PHPVER-intl \
+            php$PHPVER-json \
+            php$PHPVER-ldap \
+            php$PHPVER-mbstring \
+            php$PHPVER-pgsql \
+            php$PHPVER-redis \
+            php$PHPVER-soap \
+            php$PHPVER-xml \
+            php$PHPVER-xmlrpc \
+            php$PHPVER-zip \
             redis-server \
             unzip \
             "

From 1753a5a401c22d6508a985164410f7728340e427 Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Sat, 11 Nov 2023 16:16:04 -0600
Subject: [PATCH 03/19] fix conflicts

---
 jra_nextcloud.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/jra_nextcloud.sh b/jra_nextcloud.sh
index 30aa97c..204c04f 100644
--- a/jra_nextcloud.sh
+++ b/jra_nextcloud.sh
@@ -117,6 +117,9 @@ else
     apt-get update -q2
 fi
 }
+=======
+
+>>>>>>> 42703a0 (jra_nextcloud.sh: fix add gpgp key function and add install available version pacjage)
 while [[ "$ANS_NCD" != "yes" ]]
 do
   read -p "> Please set your domain (or subdomain) here for Nextcloud: (e.g.: cloud.domain.com)$NL" -r NC_DOMAIN

From 43ec159b7161ba631ca24ca5ba2044d6c012a079 Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Mon, 24 Jul 2023 02:34:43 -0600
Subject: [PATCH 04/19] jra_nextcloud.sh: organize functions, add apt checks,
 higher password lenght and small fixes.

---
 jra_nextcloud.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/jra_nextcloud.sh b/jra_nextcloud.sh
index 204c04f..4fdbe44 100644
--- a/jra_nextcloud.sh
+++ b/jra_nextcloud.sh
@@ -117,9 +117,6 @@ else
     apt-get update -q2
 fi
 }
-=======
-
->>>>>>> 42703a0 (jra_nextcloud.sh: fix add gpgp key function and add install available version pacjage)
 while [[ "$ANS_NCD" != "yes" ]]
 do
   read -p "> Please set your domain (or subdomain) here for Nextcloud: (e.g.: cloud.domain.com)$NL" -r NC_DOMAIN
@@ -213,7 +210,6 @@ exit_ifinstalled postgresql-"$PSGVER"
 install_ifnot postgresql-"$PSGVER"
 
 # PHP 7.4 / 8.1
-
 add_php
 install_aval_package " \
             imagemagick \

From 5226133ce7b0b1196d9f15215e11c65270f383b6 Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Wed, 23 Aug 2023 00:39:52 -0600
Subject: [PATCH 05/19] changelog: update previous version.

---
 changelog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/changelog b/changelog
index c0a3392..b2a5305 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 quick-jibri-installer (7.2.1)
 
     * changelog: update previous version.

From 390aa1bc0b41b11dac7a48dd390ae972ebe8adfc Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Tue, 7 Nov 2023 14:42:50 -0600
Subject: [PATCH 06/19] misc: update repository address to new home.

---
 README.md                   |  8 ++++----
 etherpad-docker.sh          |  4 ++--
 grafana.sh                  |  2 +-
 jra_nextcloud.sh            |  4 ++--
 mode/chp-mode.sh            |  6 +++---
 quick_jibri_installer.sh    | 28 ++++++++++++++--------------
 tools/jibri-conf-upgrade.sh |  6 +++---
 tools/test-jibri-env.sh     | 12 ++++++------
 8 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/README.md b/README.md
index 41af906..6c06839 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ As for our current latest release, as we have integrated more and more features,
 Login into your clean server, clone git repository and run the installer,
 
 ```
-git clone https://github.com/switnet-ltd/quick-jibri-installer
+git clone https://forge.switnet.net/switnet/quick-jibri-installer
 cd quick-jibri-installer
 sudo bash quick_jibri_installer.sh
 ```
@@ -48,7 +48,7 @@ Check more details on our wiki.
 ## Requirements
 1. Clean VM/VPS/Server using a supported Ubuntu LTS
 2. Valid domain with DNS record, **mandatory** for SSL certs via Let's Encrypt.
-3. open ports for JMS interaction, [see wiki](https://github.com/switnet-ltd/quick-jibri-installer/wiki/Firewall).
+3. open ports for JMS interaction, [see wiki](https://forge.switnet.net/switnet/quick-jibri-installer/wiki/Firewall).
 4. Starting at 8 GB RAM / 4 Cores @ ~3.0GHz
     *  Adding resources as your audience or features you require, so your experience don't suffer from the lack of resources.
 5. Webcam
@@ -73,7 +73,7 @@ Feel free to use our `test-jibri-env.sh` tool to find some details on your curre
 * Enabled Session Recording via Jibri
   * Rename Jibri folder with name room + date.
   * Jibri node network.
-    * 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://forge.switnet.net/switnet/quick-jibri-installer/wiki/Setup-and-Jibri-Nodes)).
 * JRA (Jibri Recordings Access) via Nextcloud
 * Grafana Dashboard
 * Etherpad via docker install
@@ -115,7 +115,7 @@ Feel free to use our `test-jibri-env.sh` tool to find some details on your curre
 
 
 ## Documentation
-* Please check our [wiki](https://github.com/switnet-ltd/quick-jibri-installer/wiki) for further documentation.
+* Please check our [wiki](https://forge.switnet.net/switnet/quick-jibri-installer/wiki) for further documentation.
 
 Please note: This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY.
 
diff --git a/etherpad-docker.sh b/etherpad-docker.sh
index 72999d1..77b6c40 100644
--- a/etherpad-docker.sh
+++ b/etherpad-docker.sh
@@ -115,7 +115,7 @@ elif [ -f "$WS_CONF" ]; then
     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://github.com/switnet-ltd/quick-jibri-installer/issues"
+    -> https://forge.switnet.net/switnet/quick-jibri-installer/issues"
 fi
 
 # Configure config.js
@@ -134,5 +134,5 @@ if nginx -t 2>/dev/null ; then
 else
     echo "Please check your configuration, something may be wrong."
     echo "Will not try to enable etherpad nginx configuration, please report to:
-    -> https://github.com/switnet-ltd/quick-jibri-installer/issues"
+    -> https://forge.switnet.net/switnet/quick-jibri-installer/issues"
 fi
diff --git a/grafana.sh b/grafana.sh
index fb3910f..e2e2f8a 100644
--- a/grafana.sh
+++ b/grafana.sh
@@ -167,7 +167,7 @@ if [ -f "$WS_CONF" ]; then
     systemctl restart nginx
 else
     echo "No app configuration done to server file, please report to:
-    -> https://github.com/switnet-ltd/quick-jibri-installer/issues"
+    -> https://forge.switnet.net/switnet/quick-jibri-installer/issues"
 fi
 
 echo "
diff --git a/jra_nextcloud.sh b/jra_nextcloud.sh
index 4fdbe44..aec3889 100644
--- a/jra_nextcloud.sh
+++ b/jra_nextcloud.sh
@@ -25,7 +25,7 @@ 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://github.com/switnet-ltd/quick-jibri-installer/issues "
+    -> https://forge.switnet.net/switnet/quick-jibri-installer/issues "
     exit
 fi
 }
@@ -93,7 +93,7 @@ exit_ifinstalled() {
 if [ "$(dpkg-query -W -f='${Status}' "$1" 2>/dev/null | grep -c "ok installed")" == "1" ]; then
     echo " This instance already has $1 installed, exiting..."
     echo " If you think this is an error, please report to:
-    -> https://github.com/switnet-ltd/quick-jibri-installer/issues "
+    -> https://forge.switnet.net/switnet/quick-jibri-installer/issues "
     exit
 fi
 }
diff --git a/mode/chp-mode.sh b/mode/chp-mode.sh
index 8c7f829..538edcc 100644
--- a/mode/chp-mode.sh
+++ b/mode/chp-mode.sh
@@ -87,7 +87,7 @@ Overview:
 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)
+https://forge.switnet.net/switnet/quick-jibri-installer/issues)
 "
 
 #Tools to consider
@@ -310,7 +310,7 @@ else
 echo -e "\n  Watch out!, there seems to be an issue on $MEET_CONF_HP line:
     $CHECKJS_MEET_CHP
   Most of the times this is due upstream changes, please report to
-  https://github.com/switnet-ltd/quick-jibri-installer/issues\n"
+  https://forge.switnet.net/switnet/quick-jibri-installer/issues\n"
 fi
 CHECKJS_INT_CHP="$(esvalidate "$INT_CONF_JS_HP"| cut -d ":" -f2)"
 if [ -z "$CHECKJS_INT_CHP" ]; then
@@ -319,7 +319,7 @@ else
 echo -e "\n  Watch out!, there seems to be an issue on $INT_CONF_JS_HP line:
     $CHECKJS_INT_CHP
   Most of the times this is due upstream changes, please report to
-  https://github.com/switnet-ltd/quick-jibri-installer/issues\n"
+  https://forge.switnet.net/switnet/quick-jibri-installer/issues\n"
 fi
 
 sed -i "s|$MEET_CONF|$MEET_CONF_HP|g" "$WS_CONF"
diff --git a/quick_jibri_installer.sh b/quick_jibri_installer.sh
index bcd1819..d9f7ede 100644
--- a/quick_jibri_installer.sh
+++ b/quick_jibri_installer.sh
@@ -51,7 +51,7 @@ if [ "$(dpkg-query -W -f='${Status}' "$1" 2>/dev/null | grep -c "ok installed")"
 This instance already has $1 installed, exiting...
 Please try again on a clean system.
  If you think this is an error, please report to:
-  -> https://github.com/switnet-ltd/quick-jibri-installer/issues"
+  -> https://forge.switnet.net/switnet/quick-jibri-installer/issues"
     exit
 fi
 }
@@ -158,8 +158,8 @@ Featuring:
 - Recurring changes updater
 
 Learn more about these at,
-Main repository: https://github.com/switnet-ltd/quick-jibri-installer
-Wiki and documentation: https://github.com/switnet-ltd/quick-jibri-installer/wiki\n'
+Main repository: https://forge.switnet.net/switnet/quick-jibri-installer
+Wiki and documentation: https://forge.switnet.net/switnet/quick-jibri-installer/wiki\n'
 
 read -n 1 -s -r -p "Press any key to continue..."$'\n'
 
@@ -242,7 +242,7 @@ If you plan to enable other components such as,
  - Additional Jibri Nodes
  - others.
 
->>> We higly recommend to increase resources of this server. <<<
+>>> We highly recommend to increase resources of this server. <<<
 
 For now we advice to disable the Jibri service locally and add an external
 Jibri node once this installation has finished, using our script:
@@ -364,7 +364,7 @@ apt-get -y install \
                 certbot
     if [ "$(dpkg-query -W -f='${Status}' ufw 2>/dev/null | grep -c "ok installed")" == "1"  ]; then
         echo "# Disable pre-installed ufw, more on firewall see:
-    > https://github.com/switnet-ltd/quick-jibri-installer/wiki/Firewall"
+    > https://forge.switnet.net/switnet/quick-jibri-installer/wiki/Firewall"
         ufw disable
     fi
 fi
@@ -648,7 +648,7 @@ fi
 while [ "$ENABLE_NC_ACCESS" != "yes" ] && [ "$ENABLE_NC_ACCESS" != "no" ]
 do
     read -p "> Do you want to setup Jibri Records Access via Nextcloud: (yes or no)
-( Please check requirements at: https://github.com/switnet-ltd/quick-jibri-installer )$NL" -r ENABLE_NC_ACCESS
+( Please check requirements at: https://forge.switnet.net/switnet/quick-jibri-installer )$NL" -r ENABLE_NC_ACCESS
     if [ "$ENABLE_NC_ACCESS" = "no" ]; then
         printf " - JRA via Nextcloud won't be enabled.\n\n"
     elif [ "$ENABLE_NC_ACCESS" = "yes" ]; then
@@ -664,7 +664,7 @@ elif [ "$(curl -s -o /dev/null -w "%{http_code}" "$GC_SDK_REL_FILE" )" == "200"
     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://github.com/switnet-ltd/quick-jibri-installer )$NL" -r ENABLE_TRANSCRIPT
+( Please check requirements at: https://forge.switnet.net/switnet/quick-jibri-installer )$NL" -r ENABLE_TRANSCRIPT
         if [ "$ENABLE_TRANSCRIPT" = "no" ]; then
             printf " - Jigasi Transcription won't be enabled.\n\n"
         elif [ "$ENABLE_TRANSCRIPT" = "yes" ]; then
@@ -673,14 +673,14 @@ elif [ "$(curl -s -o /dev/null -w "%{http_code}" "$GC_SDK_REL_FILE" )" == "200"
     done
 else
     echo "No valid option for Jigasi. Please report this to
-https://github.com/switnet-ltd/quick-jibri-installer/issues"
+https://forge.switnet.net/switnet/quick-jibri-installer/issues"
 fi
 sleep .1
 #Grafana
 while [ "$ENABLE_GRAFANA_DSH" != "yes" ] && [ "$ENABLE_GRAFANA_DSH" != "no" ]
 do
 read -p "> Do you want to setup Grafana Dashboard: (yes or no)
-( Please check requirements at: https://github.com/switnet-ltd/quick-jibri-installer )$NL" -r ENABLE_GRAFANA_DSH
+( Please check requirements at: https://forge.switnet.net/switnet/quick-jibri-installer )$NL" -r ENABLE_GRAFANA_DSH
 if [ "$ENABLE_GRAFANA_DSH" = "no" ]; then
     printf " - Grafana Dashboard won't be enabled.\n\n"
 elif [ "$ENABLE_GRAFANA_DSH" = "yes" ]; then
@@ -712,7 +712,7 @@ INT_CONF_ETC="/etc/jitsi/meet/$DOMAIN-interface_config.js"
 ssl_wa() {
 if [ "$LE_SSL" = "yes" ]; then
   systemctl stop "$1"
-  certbot certonly --standalone --renew-by-default --agree-tos --email "$5" -d "$6"
+  certbot certonly --standalone --renew-by-default --agree-tos --email "$5" -d "$6" --non-interactive
   sed -i "s|/etc/jitsi/meet/$3.crt|/etc/letsencrypt/live/$3/fullchain.pem|" "$4"
   sed -i "s|/etc/jitsi/meet/$3.key|/etc/letsencrypt/live/$3/privkey.pem|" "$4"
   systemctl restart "$1"
@@ -1047,7 +1047,7 @@ if [ -f "$WS_CONF" ]; then
     systemctl reload nginx
 else
     echo "No app configuration done to server file, please report to:
-    -> https://github.com/switnet-ltd/quick-jibri-installer/issues"
+    -> https://forge.switnet.net/switnet/quick-jibri-installer/issues"
 fi
 #Static avatar
 if [ "$ENABLE_SA" = "yes" ] && [ -f "$WS_CONF" ]; then
@@ -1067,7 +1067,7 @@ elif [ "$DROP_TLS1" = "no" ];then
     printf "\nNo TLSv1/1.1 dropping was done.\n\n"
 else
     echo "No condition meet, please report to
-https://github.com/switnet-ltd/quick-jibri-installer/issues "
+https://forge.switnet.net/switnet/quick-jibri-installer/issues "
 fi
 sleep .1
 #================== Setup prosody conf file =================
@@ -1174,7 +1174,7 @@ else
     echo -e "\nWatch 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\n"
+https://forge.switnet.net/switnet/quick-jibri-installer/issues\n"
 fi
 
 #Enable jibri services
@@ -1227,7 +1227,7 @@ if [ -f "$WS_CONF" ]; then
     systemctl reload nginx
 else
     echo "No interface_config.js configuration done to server file, please report to:
-    -> https://github.com/switnet-ltd/quick-jibri-installer/issues"
+    -> https://forge.switnet.net/switnet/quick-jibri-installer/issues"
 fi
 #JRA via Nextcloud
 if [ "$ENABLE_NC_ACCESS" = "yes" ]; then
diff --git a/tools/jibri-conf-upgrade.sh b/tools/jibri-conf-upgrade.sh
index efebb74..7b866fb 100644
--- a/tools/jibri-conf-upgrade.sh
+++ b/tools/jibri-conf-upgrade.sh
@@ -77,18 +77,18 @@ if [ -f "$CONF_JSON"_disabled ] && \
    [ -f "$JIBRI_CONF" ] && \
    [ -f "$JIBRI_CONF"-dpkg-file ]; then
     echo -e "\n> This jibri config has been upgraded already, we'll exit...\n\nIf you think there maybe an error on checking you current jibri configuration.\nPlease report this to \
-https://github.com/switnet-ltd/quick-jibri-installer/issues\n"
+https://forge.switnet.net/switnet/quick-jibri-installer/issues\n"
     exit
 elif [ ! -f "$CONF_JSON" ] && \
    [ -f "$JIBRI_CONF" ] && \
    [ -f "$JIBRI_CONF"-dpkg-file ]; then
     echo -e "\n> This jibri seems to be running the latest configuration already, we'll exit...\n\nIf you think there maybe an error on checking you current jibri configuration.\nPlease report this to \
-https://github.com/switnet-ltd/quick-jibri-installer/issues\n"
+https://forge.switnet.net/switnet/quick-jibri-installer/issues\n"
     exit
 elif [ -f "$CONF_JSON" ] && \
    [ -f "$JIBRI_CONF" ]; then
     echo -e "\n> This jibri config seems to be candidate for upgrading, we'll continue...\nIf you think there maybe an error on checking you current jibri configuration.\nPlease report this to \
-https://github.com/switnet-ltd/quick-jibri-installer/issues\n"
+https://forge.switnet.net/switnet/quick-jibri-installer/issues\n"
 fi
 
 #Read missing variables
diff --git a/tools/test-jibri-env.sh b/tools/test-jibri-env.sh
index 9feffee..2530d0e 100644
--- a/tools/test-jibri-env.sh
+++ b/tools/test-jibri-env.sh
@@ -191,18 +191,18 @@ if [ -f "${CONF_JSON}"_disabled ] && \
    [ -f "$JIBRI_CONF" ] && \
    [ -f "$JIBRI_CONF"-dpkg-file ]; then
     echo -e "\n> This jibri config has been upgraded already. \xE2\x9C\x94 \n\nIf you think there maybe an error on checking you current jibri configuration.\nPlease report this to \
-https://github.com/switnet-ltd/quick-jibri-installer/issues\n"
+https://forge.switnet.net/switnet/quick-jibri-installer/issues\n"
 T6=1
 elif [ ! -f "$CONF_JSON" ] && \
      [ -f "$JIBRI_CONF" ] && \
      [ -f "${JIBRI_CONF}"-dpkg-file ]; then
     echo -e "\n> This jibri seems to be running the latest configuration already. \xE2\x9C\x94 \n\nIf you think there maybe an error on checking you current jibri configuration.\nPlease report this to \
-https://github.com/switnet-ltd/quick-jibri-installer/issues\n"
+https://forge.switnet.net/switnet/quick-jibri-installer/issues\n"
 T6=1
 elif [ -f "${CONF_JSON}" ] && \
      [ -f "$JIBRI_CONF" ]; then
     echo -e "\n> This jibri config seems to be candidate for upgrading. \xE2\x9C\x96 \nIf you think there maybe an error on checking you current jibri configuration.\nPlease report this to \
-https://github.com/switnet-ltd/quick-jibri-installer/issues\n"
+https://forge.switnet.net/switnet/quick-jibri-installer/issues\n"
 T6=0
 fi
 
@@ -210,11 +210,11 @@ fi
 echo -e "\n#6.1 -- Check for specific Chrome flag --\n"
 if [ "$(grep -c "ignore-certificate-errors"  $JIBRI_CONF)" != 0 ]; then
     echo -e "\n> Seems you have the \"--ignore-certificate-errors\" flag required for Chrome v88 and later. \xE2\x9C\x94 \n\nIf you think there maybe an error on checking you current jibri configuration.\nPlease report this to \
-https://github.com/switnet-ltd/quick-jibri-installer/issues\n"
+https://forge.switnet.net/switnet/quick-jibri-installer/issues\n"
 T6_1="0.1"
 else
-echo -e "\n> The jibri config may be missing the required chrome flags. \xE2\x9C\x96 \nPlease check:\n https://github.com/switnet-ltd/quick-jibri-installer/blob/master/quick_jibri_installer.sh#L820 \n\nIf you think there maybe an error on checking you current jibri configuration.\nPlease report this to \
-https://github.com/switnet-ltd/quick-jibri-installer/issues\n"
+echo -e "\n> The jibri config may be missing the required chrome flags. \xE2\x9C\x96 \nPlease check:\n https://forge.switnet.net/switnet/quick-jibri-installer/src/branch/master/quick_jibri_installer.sh#L870 \n\nIf you think there maybe an error on checking you current jibri configuration.\nPlease report this to \
+https://forge.switnet.net/switnet/quick-jibri-installer/issues\n"
 T6_1=0
 fi
 

From a5c8f2f93f8ee02e18a3dc3d7f7315f0f927ddb7 Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Wed, 8 Nov 2023 00:34:51 -0600
Subject: [PATCH 07/19] misc: update year to late 2023.

---
 README.md                          | 2 +-
 add-jibri-node.sh                  | 2 +-
 add-jvb2-node.sh                   | 2 +-
 grafana.sh                         | 2 +-
 jitsi-updater.sh                   | 2 +-
 jm-bm.sh                           | 2 +-
 jra_nextcloud.sh                   | 2 +-
 mode/chp-mode.sh                   | 2 +-
 mode/grid/selenium-grid-docker.sh  | 2 +-
 mode/jms-stu.sh                    | 2 +-
 mode/jwt.sh                        | 2 +-
 quick_jibri_installer.sh           | 2 +-
 tools/aws-grub-setup.sh            | 2 +-
 tools/fail2ban_ssh.sh              | 2 +-
 tools/jibri-conf-upgrade.sh        | 2 +-
 tools/jibri-resolution-enhancer.sh | 2 +-
 tools/start-over.sh                | 2 +-
 tools/test-jibri-env.sh            | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 6c06839..ee9dfb4 100644
--- a/README.md
+++ b/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 © - 2022, https://switnet.net/
+SwITNet Ltd © - 2023, https://switnet.net/
diff --git a/add-jibri-node.sh b/add-jibri-node.sh
index 80652e9..873de4b 100644
--- a/add-jibri-node.sh
+++ b/add-jibri-node.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Jibri Node Aggregator
-# SwITNet Ltd © - 2022, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 # GPLv3 or later.
 
 ### 0_LAST EDITION TIME STAMP ###
diff --git a/add-jvb2-node.sh b/add-jvb2-node.sh
index d94ab67..c7e4981 100644
--- a/add-jvb2-node.sh
+++ b/add-jvb2-node.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # JVB2 Node Aggregator
-# SwITNet Ltd © - 2022, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 # GPLv3 or later.
 
 ### 0_LAST EDITION TIME STAMP ###
diff --git a/grafana.sh b/grafana.sh
index e2e2f8a..ecc9617 100644
--- a/grafana.sh
+++ b/grafana.sh
@@ -8,7 +8,7 @@
 # by "mephisto"
 #
 # Igor Kerstges © - 2021
-# SwITNet Ltd © - 2022, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 #
 # GPLv3 or later.
 
diff --git a/jitsi-updater.sh b/jitsi-updater.sh
index 1339f16..c6705e6 100644
--- a/jitsi-updater.sh
+++ b/jitsi-updater.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Jitsi Meet recurring upgrader and customization keeper
 # for Debian/*buntu binaries.
-# SwITNet Ltd © - 2022, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 # GNU GPLv3 or later.
 
 while getopts m: option
diff --git a/jm-bm.sh b/jm-bm.sh
index dc1127e..09927c7 100644
--- a/jm-bm.sh
+++ b/jm-bm.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Jitsi Meet brandless mode
 # for Debian/*buntu binaries.
-# SwITNet Ltd © - 2022, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 # GNU GPLv3 or later.
 
 while getopts m: option
diff --git a/jra_nextcloud.sh b/jra_nextcloud.sh
index aec3889..7008aed 100644
--- a/jra_nextcloud.sh
+++ b/jra_nextcloud.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # JRA (Jibri Recordings Access) via Nextcloud
-# SwITNet Ltd © - 2022, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 # GPLv3 or later.
 
 while getopts m: option
diff --git a/mode/chp-mode.sh b/mode/chp-mode.sh
index 538edcc..d57181d 100644
--- a/mode/chp-mode.sh
+++ b/mode/chp-mode.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Custom High Performance Jitsi conf
-# SwITNet Ltd © - 2022, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 # GPLv3 or later.
 
 while getopts m: option
diff --git a/mode/grid/selenium-grid-docker.sh b/mode/grid/selenium-grid-docker.sh
index 868efd4..adefa25 100644
--- a/mode/grid/selenium-grid-docker.sh
+++ b/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 © - 2022, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 # GPLv3 or later.
 
 while getopts m: option
diff --git a/mode/jms-stu.sh b/mode/jms-stu.sh
index 2eb4e2d..e16aa11 100644
--- a/mode/jms-stu.sh
+++ b/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 © - 2022, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 # GPLv3 or later.
 
 while getopts m: option
diff --git a/mode/jwt.sh b/mode/jwt.sh
index 9c3ae62..1a42e4c 100644
--- a/mode/jwt.sh
+++ b/mode/jwt.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # JWT Mode Setup
-# SwITNet Ltd © - 2022, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 # GPLv3 or later.
 
 while getopts m: option
diff --git a/quick_jibri_installer.sh b/quick_jibri_installer.sh
index d9f7ede..da4557d 100644
--- a/quick_jibri_installer.sh
+++ b/quick_jibri_installer.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Quick Jibri Installer - *buntu (LTS) based systems.
-# SwITNet Ltd © - 2022, 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
diff --git a/tools/aws-grub-setup.sh b/tools/aws-grub-setup.sh
index f485fdb..525b603 100644
--- a/tools/aws-grub-setup.sh
+++ b/tools/aws-grub-setup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Automated AWS generic kernel setup for jibri.
-# SwITNet Ltd © - 2022, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 # GPLv3 or later.
 
 while getopts m: option
diff --git a/tools/fail2ban_ssh.sh b/tools/fail2ban_ssh.sh
index 6e03f03..48d0c36 100644
--- a/tools/fail2ban_ssh.sh
+++ b/tools/fail2ban_ssh.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Simple Fail2ban configuration
-# SwITNet Ltd © - 2022, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 # GNU GPLv3 or later.
 
 while getopts m: option
diff --git a/tools/jibri-conf-upgrade.sh b/tools/jibri-conf-upgrade.sh
index 7b866fb..726cda9 100644
--- a/tools/jibri-conf-upgrade.sh
+++ b/tools/jibri-conf-upgrade.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Simple Jibri conf updater
-# SwITNet Ltd © - 2022, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 # GNU GPLv3 or later.
 
 while getopts m: option
diff --git a/tools/jibri-resolution-enhancer.sh b/tools/jibri-resolution-enhancer.sh
index 4503ecb..c408963 100644
--- a/tools/jibri-resolution-enhancer.sh
+++ b/tools/jibri-resolution-enhancer.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Simple Jibri resolution enhancer
-# SwITNet Ltd © - 2022, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 # GNU GPLv3 or later.
 
 while getopts m: option
diff --git a/tools/start-over.sh b/tools/start-over.sh
index 256bb54..e24f14f 100644
--- a/tools/start-over.sh
+++ b/tools/start-over.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #Start over
-# SwITNet Ltd © - 2022, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 # GPLv3 or later.
 
 while getopts m: option
diff --git a/tools/test-jibri-env.sh b/tools/test-jibri-env.sh
index 2530d0e..0050812 100644
--- a/tools/test-jibri-env.sh
+++ b/tools/test-jibri-env.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Simple Jibri Env tester
-# SwITNet Ltd © - 2022, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 # GNU GPLv3 or later.
 
 while getopts m: option

From 5ac6c8269a272451664b663831fdb2256be15fca Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Wed, 8 Nov 2023 00:36:32 -0600
Subject: [PATCH 08/19] excalibur: add installer for whiteboard feature.

---
 excalidraw_backend.sh | 161 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 161 insertions(+)
 create mode 100644 excalidraw_backend.sh

diff --git a/excalidraw_backend.sh b/excalidraw_backend.sh
new file mode 100644
index 0000000..63b0373
--- /dev/null
+++ b/excalidraw_backend.sh
@@ -0,0 +1,161 @@
+#!/bin/bash
+# Excalidraw Jitsi Backend Installer
+# SwITNet Ltd © - 2023, https://switnet.net/
+# GPLv3 or later.
+
+while getopts m: option
+do
+	case "${option}"
+	in
+		m) MODE=${OPTARG};;
+		\?) echo "Usage: sudo bash ./$0 [-m debug]" && exit;;
+	esac
+done
+
+#DEBUG
+if [ "$MODE" = "debug" ]; then
+set -x
+fi
+
+if ! [ "$(id -u)" = 0 ]; then
+   echo "You need to be root or have sudo privileges!"
+   exit 0
+fi
+clear
+echo -e '\n
+########################################################################
+                  Excalidraw Jitsi Backend Installer
+########################################################################
+                    by Software, IT & Networks Ltd
+\n'
+
+DOMAIN="$(find /etc/prosody/conf.d/ -name \*.lua|awk -F'.cfg' '!/localhost/{print $1}'|xargs basename)"
+WS_CONF="/etc/nginx/sites-available/$DOMAIN.conf"
+PROSODY_FILE="/etc/prosody/conf.d/$DOMAIN.cfg.lua"
+MEET_CONF="/etc/jitsi/meet/$DOMAIN-config.js"
+WS_MATCH1='# ensure all static content can always be found first'
+PROS_MATCH1='"av_moderation";'
+PROS_MATCH2='breakout_rooms_muc = "breakout.'
+PROS_MATCH3='VirtualHost "recorder.'
+CONFIG_MATCH1='Settings for the GIPHY integration'
+EXCALIDRAW_HOME="/opt/excalidraw"
+EXCAL_MATCH1="prometheus.metrics(io"
+EXCAL_NEW_PORT="9091"
+EXCAL_PORT_FILE="src/index.ts"
+
+
+# Test for matches
+test_match() {
+if grep -q "$1" "$2" ; then
+    echo "It is possible to setup "$(basename $2)", continuing..."
+else
+    echo "It is not possible to setup "$(basename $2)", stopping here."
+    echo "Please report this to https://forge.switnet.net/switnet/quick-jibri-installer"
+    exit
+fi
+}
+# Make sure we can rely on the match strings.
+test_match "$WS_MATCH1" "$WS_CONF"
+test_match "$PROS_MATCH1" "$PROSODY_FILE"
+test_match "$PROS_MATCH2" "$PROSODY_FILE"
+test_match "$PROS_MATCH3" "$PROSODY_FILE"
+test_match "$PROS_MATCH3" "$PROSODY_FILE"
+test_match "$CONFIG_MATCH1" "$MEET_CONF"
+test_match "$EXCAL_MATCH1" "$EXCAL_PORT_FILE"
+
+adduser --home "$EXCALIDRAW_HOME" --disabled-password --gecos "" excalidraw
+git clone https://github.com/jitsi/excalidraw-backend "$EXCALIDRAW_HOME/backend"
+
+chown -R excalidraw:excalidraw "$EXCALIDRAW_HOME"
+cd "$EXCALIDRAW_HOME/backend"
+sudo -u excalidraw cp .env.development .env.production
+
+# Keep used replacement port to get some sort of standarization.
+if sed -n "/$EXCAL_MATCH1/,/});/p" "$EXCAL_PORT_FILE" |grep -q port: ; then
+    echo "Update predefined port for metrics to $EXCAL_NEW_PORT"
+    sed -i "/$EXCAL_MATCH1/,/});/s|port:.*,|port: $EXCAL_NEW_PORT,|" "$EXCAL_PORT_FILE"
+else
+    echo "Define new port from default to $EXCAL_NEW_PORT"
+    sed -i  "/$EXCAL_MATCH1/a \ \ \ \ port: $EXCAL_NEW_PORT," "$EXCAL_PORT_FILE"
+fi
+
+sudo -u excalidraw npm install
+sudo -u excalidraw npm run build
+
+# Enable websocket on nginx
+sed -i "/$WS_MATCH1/i \\\n" "$WS_CONF"
+sed -i "/$WS_MATCH1/i \ \ \ \ location = /socket.io/ {" "$WS_CONF"
+sed -i "/$WS_MATCH1/i \ \ \ \ \ \ \ \ proxy_pass http://127.0.0.1:3002/socket.io/?\$args;" "$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 \"upgrade\";" "$WS_CONF"
+sed -i "/$WS_MATCH1/i \ \ \ \ \ \ \ \ proxy_set_header Host \$http_host;" "$WS_CONF"
+sed -i "/$WS_MATCH1/i \ \ \ \ \ \ \ \ tcp_nodelay on;" "$WS_CONF"
+sed -i "/$WS_MATCH1/i \ \ \ \ }" "$WS_CONF"
+sed -i "/$WS_MATCH1/i \\\n" "$WS_CONF"
+
+if grep -rq room_metadata /etc/prosody/conf.d/ ;then
+    echo "Prosody seems to be already configured."
+else
+    echo "Setting up prosody for whiteboard..."
+    # Modules enabled
+    sed -i "/$PROS_MATCH1/a \ \ \ \ \ \ \ \ \"room_metadata\";" "$PROSODY_FILE"
+    # Define internal component
+    sed -i "/$PROS_MATCH2/a \ \ \ \ room_metadata_component = \"metadata.$DOMAIN\"" "$PROSODY_FILE"
+    # Register component
+    sed -i "/$PROS_MATCH3/i \\\n" "$PROSODY_FILE"
+    sed -i "/$PROS_MATCH3/i Component \"metadata.$DOMAIN\" \"room_metadata_component\"" "$PROSODY_FILE"
+    sed -i "/$PROS_MATCH3/i \ \ \ \ muc_component = \"conference.$DOMAIN\"" "$PROSODY_FILE"
+    sed -i "/$PROS_MATCH3/i \ \ \ \ breakout_rooms_component = \"breakout.$DOMAIN\"" "$PROSODY_FILE"
+    sed -i "/$PROS_MATCH3/i \\\n" "$PROSODY_FILE"
+fi
+
+echo "Checking for "$(basename $MEET_CONF)" setup."
+if [ -z "$(sed -n '/whiteboard: {/,/},/p' $MEET_CONF)" ]; then
+    echo "No present configuration on current config.js file"
+    sed -i "/$CONFIG_MATCH1/i \\\n" "$MEET_CONF"
+    sed -i "/$CONFIG_MATCH1/i \ \ \ \ whiteboard: {" "$MEET_CONF"
+    sed -i "/$CONFIG_MATCH1/i \ \ \ \ \ \ \ \ enabled: true," "$MEET_CONF"
+    sed -i "/$CONFIG_MATCH1/i \ \ \ \ \ \ \ \ collabServerBaseUrl: 'https://$DOMAIN'" "$MEET_CONF"
+    sed -i "/$CONFIG_MATCH1/i \ \ \ \ }," "$MEET_CONF"
+    sed -i "/$CONFIG_MATCH1/i \\\n" "$MEET_CONF"
+else
+    echo "Enabling configuration on current config.js file"
+    sed -i "/whiteboard: {/,/},/s|// ||" "$MEET_CONF"
+    sed -i "/collabServerBaseUrl:/s|'https://.*'|'https://$DOMAIN'|" "$MEET_CONF"
+fi
+
+if  sed -n '/toolbarButtons: \[/,/\],/p' "$MEET_CONF" | \
+    grep -v '//'| grep -q whiteboard ; then
+    echo "Whiteboard toolbar already enabled."
+elif sed -n '/toolbarButtons: \[/,/\],/p' "$MEET_CONF" | \
+     grep -v '//'|grep -q toolbarButtons: ; then 
+    echo "Enabling whiteboard toolbar."
+    sed -i "/toolbarButtons:/a \ \ \ \ \ \ \ 'whiteboard'," "$MEET_CONF"
+else
+    echo "ToolbarButtons not customized, whiteboard should be enabled by default,"
+    echo "otherwise, please report to: https://forge.switnet.net/switnet/quick-jibri-installer/issues"
+fi
+
+# Systemd service
+cat << EOF > /etc/systemd/system/excalidraw.service
+[Unit]
+Description=Excalidraw backend
+After=network-online.target
+
+[Service]
+User=excalidraw
+Group=excalidraw
+WorkingDirectory=$EXCALIDRAW_HOME/backend
+ExecStart=npm start
+Restart=always
+RestartSec=5s
+
+[Install]
+WantedBy=multi-user.target
+EOF
+
+systemctl enable excalidraw.service
+systemctl start excalidraw.service
+
+echo -e "\nExcalidraw installation/setup complete!\n"

From 7de6201af6a57f24c100eb1f3d22ef3bb019eda6 Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Wed, 8 Nov 2023 00:40:56 -0600
Subject: [PATCH 09/19] excalibur: minor shell fixes.

---
 excalidraw_backend.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/excalidraw_backend.sh b/excalidraw_backend.sh
index 63b0373..07f4c28 100644
--- a/excalidraw_backend.sh
+++ b/excalidraw_backend.sh
@@ -47,9 +47,9 @@ EXCAL_PORT_FILE="src/index.ts"
 # Test for matches
 test_match() {
 if grep -q "$1" "$2" ; then
-    echo "It is possible to setup "$(basename $2)", continuing..."
+    echo "It is possible to setup $(basename "$2"), continuing..."
 else
-    echo "It is not possible to setup "$(basename $2)", stopping here."
+    echo "It is not possible to setup $(basename "$2"), stopping here."
     echo "Please report this to https://forge.switnet.net/switnet/quick-jibri-installer"
     exit
 fi
@@ -110,8 +110,8 @@ else
     sed -i "/$PROS_MATCH3/i \\\n" "$PROSODY_FILE"
 fi
 
-echo "Checking for "$(basename $MEET_CONF)" setup."
-if [ -z "$(sed -n '/whiteboard: {/,/},/p' $MEET_CONF)" ]; then
+echo "Checking for $(basename "$MEET_CONF") setup."
+if [ -z "$(sed -n '/whiteboard: {/,/},/p' "$MEET_CONF")" ]; then
     echo "No present configuration on current config.js file"
     sed -i "/$CONFIG_MATCH1/i \\\n" "$MEET_CONF"
     sed -i "/$CONFIG_MATCH1/i \ \ \ \ whiteboard: {" "$MEET_CONF"

From d1f300984437689250be9adcd0f34bb09691d4ab Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Wed, 8 Nov 2023 01:04:53 -0600
Subject: [PATCH 10/19] excalibur: keep same naming convention

---
 excalidraw_backend.sh => excalidraw-backend.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename excalidraw_backend.sh => excalidraw-backend.sh (100%)

diff --git a/excalidraw_backend.sh b/excalidraw-backend.sh
similarity index 100%
rename from excalidraw_backend.sh
rename to excalidraw-backend.sh

From 20e1f7b3627e1a8855f1aec4cd8b14e4c1ef446b Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Wed, 8 Nov 2023 01:12:27 -0600
Subject: [PATCH 11/19] quick_jibri_installer.sh: add excalidraw whiteboard
 backend

disable jigasi selector and checks
---
 quick_jibri_installer.sh | 61 +++++++++++++++++++++++++++-------------
 1 file changed, 41 insertions(+), 20 deletions(-)

diff --git a/quick_jibri_installer.sh b/quick_jibri_installer.sh
index da4557d..7e3ae53 100644
--- a/quick_jibri_installer.sh
+++ b/quick_jibri_installer.sh
@@ -498,12 +498,12 @@ 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"
-GC_SDK_REL_FILE="http://packages.cloud.google.com/apt/dists/cloud-sdk-$(lsb_release -sc)/Release"
 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"
+#GC_SDK_REL_FILE="http://packages.cloud.google.com/apt/dists/cloud-sdk-$(lsb_release -sc)/Release"
 
 # Rename hostname for jitsi server
 while [ "$FQDN_HOST" != "yes" ] && [ "$FQDN_HOST" != "no" ] && [ -n "$FQDN_HOST" ]
@@ -656,25 +656,25 @@ do
     fi
 done
 sleep .1
-#Jigasi
-if [ "$(curl -s -o /dev/null -w "%{http_code}" "$GC_SDK_REL_FILE" )" == "404" ]; then
-    printf "> Sorry Google SDK doesn't have support yet for %s,
-    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
-            printf " - Jigasi Transcription won't be enabled.\n\n"
-        elif [ "$ENABLE_TRANSCRIPT" = "yes" ]; then
-            printf " - Jigasi Transcription will be enabled.\n\n"
-        fi
-    done
-else
-    echo "No valid option for Jigasi. Please report this to
-https://forge.switnet.net/switnet/quick-jibri-installer/issues"
-fi
+##Jigasi
+#if [ "$(curl -s -o /dev/null -w "%{http_code}" "$GC_SDK_REL_FILE" )" == "404" ]; then
+    #printf "> Sorry Google SDK doesn't have support yet for %s,
+    #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
+            #printf " - Jigasi Transcription won't be enabled.\n\n"
+        #elif [ "$ENABLE_TRANSCRIPT" = "yes" ]; then
+            #printf " - Jigasi Transcription will be enabled.\n\n"
+        #fi
+    #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" ]
@@ -699,6 +699,17 @@ elif [ "$ENABLE_DOCKERPAD" = "yes" ]; then
 fi
 done
 sleep .1
+#Excalidraw Whiteboard
+while [ "$ENABLE_WHITEBOARD" != "yes" ] && [ "$ENABLE_WHITEBOARD" != "no" ]
+do
+read -p "> Do you want to setup Excalidraw Whiteboard backend: (yes or no)$NL" -r ENABLE_WHITEBOARD
+if [ "$ENABLE_WHITEBOARD" = "no" ]; then
+    printf " - Excalidraw Whiteboard won't be enabled.\n"
+elif [ "$ENABLE_WHITEBOARD" = "yes" ]; then
+    printf " - Excalidraw Whiteboard will be enabled.\n"
+fi
+done
+sleep .1
 #Start configuration
 echo '
 ########################################################################
@@ -1260,6 +1271,16 @@ if [ "$ENABLE_DOCKERPAD" = "yes" ]; then
     fi
 fi
 sleep .1
+#Excalidraw Whiteboard
+if [ "$ENABLE_WHITEBOARD" = "yes" ]; then
+    printf "\nExcalidraw Whiteboard will be enabled."
+    if [ "$MODE" = "debug" ]; then
+        bash "$PWD"/excalidraw-backend.sh -m debug
+    else
+        bash "$PWD"/excalidraw-backend.sh
+    fi
+fi
+sleep .1
 #Prevent JMS conecction issue
 if [ -z "$(awk "/127.0.0.1/&&/$DOMAIN/{print\$1}" /etc/hosts)" ];then
     sed -i "/127.0.0.1/a \\

From 5c7dfb9984c0287e7495098098f19eca64d2b70f Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Wed, 8 Nov 2023 18:10:39 -0600
Subject: [PATCH 12/19] quick_jibri_installer.sh: update features list.

---
 quick_jibri_installer.sh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/quick_jibri_installer.sh b/quick_jibri_installer.sh
index 7e3ae53..e631c3b 100644
--- a/quick_jibri_installer.sh
+++ b/quick_jibri_installer.sh
@@ -144,7 +144,7 @@ printwc "${Blue}" "\n# $1"
 printwc "${Blue}" "\n#--------------------------------------------------\n"
 }
 clear
-printf '
+printfwc "${Green}" '
 ########################################################################
                     Welcome to Jitsi/Jibri Installer
 ########################################################################
@@ -153,9 +153,11 @@ printf '
 Featuring:
 - Jibri Recording and YouTube Streaming
 - Jibri Recordings Access via Nextcloud
-- Jigasi Transcription (Advanced)
+- Grafana Statistics
+- Etherpad
+- Whiteboard
 - Customized brandless mode
-- Recurring changes updater
+- Recurring updater
 
 Learn more about these at,
 Main repository: https://forge.switnet.net/switnet/quick-jibri-installer
@@ -238,8 +240,10 @@ echo 'This server will likely have issues due the lack of resources.
 If you plan to enable other components such as,
 
  - JRA via Nextcloud
- - Jigasi Transcriber
- - Additional Jibri Nodes
+ - Grafana
+ - Etherpad
+ - Whiteboards
+ - additional Jibri Nodes
  - others.
 
 >>> We highly recommend to increase resources of this server. <<<

From 86e39afa5c1a18801032d92c730c6cbe90106187 Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Wed, 8 Nov 2023 18:16:40 -0600
Subject: [PATCH 13/19] excalidraw-backend.sh: fix test possition and make
 varibale absolute path.

---
 excalidraw-backend.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/excalidraw-backend.sh b/excalidraw-backend.sh
index 07f4c28..48428f7 100644
--- a/excalidraw-backend.sh
+++ b/excalidraw-backend.sh
@@ -41,7 +41,7 @@ CONFIG_MATCH1='Settings for the GIPHY integration'
 EXCALIDRAW_HOME="/opt/excalidraw"
 EXCAL_MATCH1="prometheus.metrics(io"
 EXCAL_NEW_PORT="9091"
-EXCAL_PORT_FILE="src/index.ts"
+EXCAL_PORT_FILE="$EXCALIDRAW_HOME/backend/src/index.ts"
 
 
 # Test for matches
@@ -61,10 +61,10 @@ test_match "$PROS_MATCH2" "$PROSODY_FILE"
 test_match "$PROS_MATCH3" "$PROSODY_FILE"
 test_match "$PROS_MATCH3" "$PROSODY_FILE"
 test_match "$CONFIG_MATCH1" "$MEET_CONF"
-test_match "$EXCAL_MATCH1" "$EXCAL_PORT_FILE"
 
 adduser --home "$EXCALIDRAW_HOME" --disabled-password --gecos "" excalidraw
 git clone https://github.com/jitsi/excalidraw-backend "$EXCALIDRAW_HOME/backend"
+test_match "$EXCAL_MATCH1" "$EXCAL_PORT_FILE"
 
 chown -R excalidraw:excalidraw "$EXCALIDRAW_HOME"
 cd "$EXCALIDRAW_HOME/backend"

From a2a5c590b0dcfca05b5dbec69dfb7642569190ed Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Thu, 9 Nov 2023 23:29:32 -0600
Subject: [PATCH 14/19] Fix small typo

---
 excalidraw-backend.sh    | 17 +++++++++--------
 quick_jibri_installer.sh |  6 +++---
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/excalidraw-backend.sh b/excalidraw-backend.sh
index 48428f7..5158607 100644
--- a/excalidraw-backend.sh
+++ b/excalidraw-backend.sh
@@ -47,14 +47,15 @@ EXCAL_PORT_FILE="$EXCALIDRAW_HOME/backend/src/index.ts"
 # Test for matches
 test_match() {
 if grep -q "$1" "$2" ; then
-    echo "It is possible to setup $(basename "$2"), continuing..."
+    echo "$(basename "$2") - OK..."
 else
-    echo "It is not possible to setup $(basename "$2"), stopping here."
+    echo "$(basename "$2"), FAIL..."
     echo "Please report this to https://forge.switnet.net/switnet/quick-jibri-installer"
     exit
 fi
 }
 # Make sure we can rely on the match strings.
+echo "Testing match strings on config files."
 test_match "$WS_MATCH1" "$WS_CONF"
 test_match "$PROS_MATCH1" "$PROSODY_FILE"
 test_match "$PROS_MATCH2" "$PROSODY_FILE"
@@ -70,7 +71,7 @@ chown -R excalidraw:excalidraw "$EXCALIDRAW_HOME"
 cd "$EXCALIDRAW_HOME/backend"
 sudo -u excalidraw cp .env.development .env.production
 
-# Keep used replacement port to get some sort of standarization.
+# Use documented port to get some sort of standarization.
 if sed -n "/$EXCAL_MATCH1/,/});/p" "$EXCAL_PORT_FILE" |grep -q port: ; then
     echo "Update predefined port for metrics to $EXCAL_NEW_PORT"
     sed -i "/$EXCAL_MATCH1/,/});/s|port:.*,|port: $EXCAL_NEW_PORT,|" "$EXCAL_PORT_FILE"
@@ -110,9 +111,9 @@ else
     sed -i "/$PROS_MATCH3/i \\\n" "$PROSODY_FILE"
 fi
 
-echo "Checking for $(basename "$MEET_CONF") setup."
+echo "Checking for whitebord setup at $(basename "$MEET_CONF")."
 if [ -z "$(sed -n '/whiteboard: {/,/},/p' "$MEET_CONF")" ]; then
-    echo "No present configuration on current config.js file"
+    echo "> No present configuration on current config.js file"
     sed -i "/$CONFIG_MATCH1/i \\\n" "$MEET_CONF"
     sed -i "/$CONFIG_MATCH1/i \ \ \ \ whiteboard: {" "$MEET_CONF"
     sed -i "/$CONFIG_MATCH1/i \ \ \ \ \ \ \ \ enabled: true," "$MEET_CONF"
@@ -120,17 +121,17 @@ if [ -z "$(sed -n '/whiteboard: {/,/},/p' "$MEET_CONF")" ]; then
     sed -i "/$CONFIG_MATCH1/i \ \ \ \ }," "$MEET_CONF"
     sed -i "/$CONFIG_MATCH1/i \\\n" "$MEET_CONF"
 else
-    echo "Enabling configuration on current config.js file"
+    echo "> Enabling configuration on current config.js file"
     sed -i "/whiteboard: {/,/},/s|// ||" "$MEET_CONF"
     sed -i "/collabServerBaseUrl:/s|'https://.*'|'https://$DOMAIN'|" "$MEET_CONF"
 fi
 
 if  sed -n '/toolbarButtons: \[/,/\],/p' "$MEET_CONF" | \
     grep -v '//'| grep -q whiteboard ; then
-    echo "Whiteboard toolbar already enabled."
+    echo "> Whiteboard toolbar already enabled."
 elif sed -n '/toolbarButtons: \[/,/\],/p' "$MEET_CONF" | \
      grep -v '//'|grep -q toolbarButtons: ; then 
-    echo "Enabling whiteboard toolbar."
+    echo "> Enabling whiteboard toolbar."
     sed -i "/toolbarButtons:/a \ \ \ \ \ \ \ 'whiteboard'," "$MEET_CONF"
 else
     echo "ToolbarButtons not customized, whiteboard should be enabled by default,"
diff --git a/quick_jibri_installer.sh b/quick_jibri_installer.sh
index e631c3b..b2f60e0 100644
--- a/quick_jibri_installer.sh
+++ b/quick_jibri_installer.sh
@@ -144,7 +144,7 @@ printwc "${Blue}" "\n# $1"
 printwc "${Blue}" "\n#--------------------------------------------------\n"
 }
 clear
-printfwc "${Green}" '
+printwc "${Green}" '
 ########################################################################
                     Welcome to Jitsi/Jibri Installer
 ########################################################################
@@ -243,8 +243,8 @@ If you plan to enable other components such as,
  - Grafana
  - Etherpad
  - Whiteboards
- - additional Jibri Nodes
- - others.
+ - Connect additional Jibri Nodes
+ - Others
 
 >>> We highly recommend to increase resources of this server. <<<
 

From 8b6c071d47983e2d4b2792bdfc38a206e9159f27 Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Thu, 9 Nov 2023 23:30:05 -0600
Subject: [PATCH 15/19] Improve style and comments

---
 excalidraw-backend.sh | 45 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 36 insertions(+), 9 deletions(-)

diff --git a/excalidraw-backend.sh b/excalidraw-backend.sh
index 5158607..a92b647 100644
--- a/excalidraw-backend.sh
+++ b/excalidraw-backend.sh
@@ -3,6 +3,26 @@
 # SwITNet Ltd © - 2023, https://switnet.net/
 # GPLv3 or later.
 
+# Reset
+Color_Off='\e[0m'       # Text Reset
+# Regular Colors
+Black='\e[0;30m'        # Black
+Red='\e[0;31m'          # Red
+Green='\e[0;32m'        # Green
+Yellow='\e[0;33m'       # Yellow
+Blue='\e[0;34m'         # Blue
+Purple='\e[0;35m'       # Purple
+Cyan='\e[0;36m'         # Cyan
+
+printwc() {
+    printf "%b$2%b" "$1" "${Color_Off}"
+}
+print_title() {
+printwc "${Blue}" "\n#--------------------------------------------------"
+printwc "${Blue}" "\n# $1"
+printwc "${Blue}" "\n#--------------------------------------------------\n"
+}
+
 while getopts m: option
 do
 	case "${option}"
@@ -55,7 +75,7 @@ else
 fi
 }
 # Make sure we can rely on the match strings.
-echo "Testing match strings on config files."
+printf "Testing match strings on config files.\n"
 test_match "$WS_MATCH1" "$WS_CONF"
 test_match "$PROS_MATCH1" "$PROSODY_FILE"
 test_match "$PROS_MATCH2" "$PROSODY_FILE"
@@ -63,6 +83,9 @@ test_match "$PROS_MATCH3" "$PROSODY_FILE"
 test_match "$PROS_MATCH3" "$PROSODY_FILE"
 test_match "$CONFIG_MATCH1" "$MEET_CONF"
 
+#--------------------------------------------------
+print_title "Setup excalidraw backend."
+#--------------------------------------------------
 adduser --home "$EXCALIDRAW_HOME" --disabled-password --gecos "" excalidraw
 git clone https://github.com/jitsi/excalidraw-backend "$EXCALIDRAW_HOME/backend"
 test_match "$EXCAL_MATCH1" "$EXCAL_PORT_FILE"
@@ -73,16 +96,20 @@ sudo -u excalidraw cp .env.development .env.production
 
 # Use documented port to get some sort of standarization.
 if sed -n "/$EXCAL_MATCH1/,/});/p" "$EXCAL_PORT_FILE" |grep -q port: ; then
-    echo "Update predefined port for metrics to $EXCAL_NEW_PORT"
+    echo "> Update predefined port for metrics to $EXCAL_NEW_PORT\n"
     sed -i "/$EXCAL_MATCH1/,/});/s|port:.*,|port: $EXCAL_NEW_PORT,|" "$EXCAL_PORT_FILE"
 else
-    echo "Define new port from default to $EXCAL_NEW_PORT"
+    echo "> Define new port from default to $EXCAL_NEW_PORT\n"
     sed -i  "/$EXCAL_MATCH1/a \ \ \ \ port: $EXCAL_NEW_PORT," "$EXCAL_PORT_FILE"
 fi
 
+printf "\nInstalling npm backend.\n"
 sudo -u excalidraw npm install
 sudo -u excalidraw npm run build
 
+#--------------------------------------------------
+print_title "Setup system & jitsi config files."
+#--------------------------------------------------
 # Enable websocket on nginx
 sed -i "/$WS_MATCH1/i \\\n" "$WS_CONF"
 sed -i "/$WS_MATCH1/i \ \ \ \ location = /socket.io/ {" "$WS_CONF"
@@ -96,9 +123,9 @@ sed -i "/$WS_MATCH1/i \ \ \ \ }" "$WS_CONF"
 sed -i "/$WS_MATCH1/i \\\n" "$WS_CONF"
 
 if grep -rq room_metadata /etc/prosody/conf.d/ ;then
-    echo "Prosody seems to be already configured."
+    echo "> Prosody seems to be already configured."
 else
-    echo "Setting up prosody for whiteboard..."
+    echo "> Setting up prosody for whiteboard..."
     # Modules enabled
     sed -i "/$PROS_MATCH1/a \ \ \ \ \ \ \ \ \"room_metadata\";" "$PROSODY_FILE"
     # Define internal component
@@ -134,11 +161,11 @@ elif sed -n '/toolbarButtons: \[/,/\],/p' "$MEET_CONF" | \
     echo "> Enabling whiteboard toolbar."
     sed -i "/toolbarButtons:/a \ \ \ \ \ \ \ 'whiteboard'," "$MEET_CONF"
 else
-    echo "ToolbarButtons not customized, whiteboard should be enabled by default,"
-    echo "otherwise, please report to: https://forge.switnet.net/switnet/quick-jibri-installer/issues"
+    echo "> ToolbarButtons not customized, whiteboard should be enabled by default,"
+    echo "  otherwise, please report to: https://forge.switnet.net/switnet/quick-jibri-installer/issues"
 fi
 
-# Systemd service
+printf "\n# Add systemd service\n"
 cat << EOF > /etc/systemd/system/excalidraw.service
 [Unit]
 Description=Excalidraw backend
@@ -159,4 +186,4 @@ EOF
 systemctl enable excalidraw.service
 systemctl start excalidraw.service
 
-echo -e "\nExcalidraw installation/setup complete!\n"
+printwc "${Green}" "\nExcalidraw setup complete!\n"

From 807fcd52dff4c1aacf1811261858856ddd6df7d3 Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Fri, 10 Nov 2023 00:51:18 -0600
Subject: [PATCH 16/19] update copyright and reference note.

---
 etherpad-docker.sh    | 2 +-
 excalidraw-backend.sh | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/etherpad-docker.sh b/etherpad-docker.sh
index 77b6c40..73e45b0 100644
--- a/etherpad-docker.sh
+++ b/etherpad-docker.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Etherpad Installer for Jitsi Meet
-# SwITNet Ltd  © - 2020, https://switnet.net/
+# SwITNet Ltd © - 2023, https://switnet.net/
 #
 # GPLv3 or later.
 
diff --git a/excalidraw-backend.sh b/excalidraw-backend.sh
index a92b647..a764099 100644
--- a/excalidraw-backend.sh
+++ b/excalidraw-backend.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
 # Excalidraw Jitsi Backend Installer
+#
+# Based on:
+# - https://community.jitsi.org/t/118883
+# by Dirk Materlik
+#
 # SwITNet Ltd © - 2023, https://switnet.net/
 # GPLv3 or later.
 
@@ -138,7 +143,7 @@ else
     sed -i "/$PROS_MATCH3/i \\\n" "$PROSODY_FILE"
 fi
 
-echo "Checking for whitebord setup at $(basename "$MEET_CONF")."
+printf "\n# Checking for whitebord setup at $(basename "$MEET_CONF").\n"
 if [ -z "$(sed -n '/whiteboard: {/,/},/p' "$MEET_CONF")" ]; then
     echo "> No present configuration on current config.js file"
     sed -i "/$CONFIG_MATCH1/i \\\n" "$MEET_CONF"

From 256c85a2506ee770da90cda019d193a38b5ce74f Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Fri, 10 Nov 2023 00:58:13 -0600
Subject: [PATCH 17/19] add test_match function and fix spacing.

---
 quick_jibri_installer.sh | 85 ++++++++++++++++++++++++----------------
 1 file changed, 51 insertions(+), 34 deletions(-)

diff --git a/quick_jibri_installer.sh b/quick_jibri_installer.sh
index b2f60e0..b8967f9 100644
--- a/quick_jibri_installer.sh
+++ b/quick_jibri_installer.sh
@@ -62,10 +62,9 @@ if [ "$DIST" = "$1" ]; then
   DIST="$2"
 fi
 }
-#Trisquel distro renaming
-rename_distro flidas xenial
-rename_distro etiona bionic
+#Trisquel distro upstream referencing.
 rename_distro nabia  focal
+rename_distro aramo  jammy
 
 install_ifnot() {
 if [ "$(dpkg-query -W -f='${Status}' "$1" 2>/dev/null | grep -c "ok installed")" == "1" ]; then
@@ -143,6 +142,15 @@ printwc "${Blue}" "\n#--------------------------------------------------"
 printwc "${Blue}" "\n# $1"
 printwc "${Blue}" "\n#--------------------------------------------------\n"
 }
+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
+}
 clear
 printwc "${Green}" '
 ########################################################################
@@ -161,7 +169,7 @@ Featuring:
 
 Learn more about these at,
 Main repository: https://forge.switnet.net/switnet/quick-jibri-installer
-Wiki and documentation: https://forge.switnet.net/switnet/quick-jibri-installer/wiki\n'
+Wiki and documentation: https://forge.switnet.net/switnet/quick-jibri-installer/wiki\n\n'
 
 read -n 1 -s -r -p "Press any key to continue..."$'\n'
 
@@ -507,8 +515,15 @@ 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"
+MEET_MATCH1="disable simulcast support."
 #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 "$MEET_MATCH1" "$MEET_CONF"
+
 # Rename hostname for jitsi server
 while [ "$FQDN_HOST" != "yes" ] && [ "$FQDN_HOST" != "no" ] && [ -n "$FQDN_HOST" ]
 do
@@ -697,9 +712,9 @@ while [ "$ENABLE_DOCKERPAD" != "yes" ] && [ "$ENABLE_DOCKERPAD" != "no" ]
 do
 read -p "> Do you want to setup Docker Etherpad: (yes or no)$NL" -r ENABLE_DOCKERPAD
 if [ "$ENABLE_DOCKERPAD" = "no" ]; then
-    printf " - Docker Etherpad won't be enabled.\n"
+    printf " - Docker Etherpad won't be enabled.\n\n"
 elif [ "$ENABLE_DOCKERPAD" = "yes" ]; then
-    printf " - Docker Etherpad will be enabled.\n"
+    printf " - Docker Etherpad will be enabled.\n\n"
 fi
 done
 sleep .1
@@ -708,9 +723,9 @@ while [ "$ENABLE_WHITEBOARD" != "yes" ] && [ "$ENABLE_WHITEBOARD" != "no" ]
 do
 read -p "> Do you want to setup Excalidraw Whiteboard backend: (yes or no)$NL" -r ENABLE_WHITEBOARD
 if [ "$ENABLE_WHITEBOARD" = "no" ]; then
-    printf " - Excalidraw Whiteboard won't be enabled.\n"
+    printf " - Excalidraw Whiteboard won't be enabled.\n\n"
 elif [ "$ENABLE_WHITEBOARD" = "yes" ]; then
-    printf " - Excalidraw Whiteboard will be enabled.\n"
+    printf " - Excalidraw Whiteboard will be enabled.\n\n"
 fi
 done
 sleep .1
@@ -761,7 +776,7 @@ restart_services() {
 }
 
 # Configure Jvb2
-sed -i "/shard.HOSTNAME/s|localhost|$DOMAIN|" /etc/jitsi/videobridge/sip-communicator.properties
+sed -i "/shard.HOSTNAME/s|localhost|$DOMAIN|" "$JVB2_SIP"
 
 # Configure Jibri
 if [ "$ENABLE_SC" = "yes" ]; then
@@ -769,9 +784,11 @@ if [ "$ENABLE_SC" = "yes" ]; then
   printf "\n-> Adding external module to list prosody users...\n"
   curl -s "$MOD_LISTU" > "$MOD_LIST_FILE"
 
-  printf "Now you can check registered users with:\nprosodyctl mod_listusers\n"
+  printf "Now you can check registered users with:"
+  printf " \n  prosodyctl mod_listusers\n"
     else
-  printf "Prosody support for listing users seems to be enabled. \ncheck with: prosodyctl mod_listusers\n"
+  printf "Prosody support for listing users seems to be enabled.check with:"
+  printf " \n  prosodyctl mod_listusers\n"
   fi
 
 fi
@@ -1054,11 +1071,11 @@ 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 "/# ensure all static content can always be found first/i \\\n" "$WS_CONF"
-    sed -i "/# ensure all static content can always be found first/i \ \ \ \ location = \/external_api.min.js {" "$WS_CONF"
-    sed -i "/# ensure all static content can always be found first/i \ \ \ \ \ \ \ \ alias \/usr\/share\/jitsi-meet\/libs\/external_api.min.js;" "$WS_CONF"
-    sed -i "/# ensure all static content can always be found first/i \ \ \ \ }" "$WS_CONF"
-    sed -i "/# ensure all static content can always be found first/i \\\n" "$WS_CONF"
+    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:
@@ -1161,24 +1178,24 @@ fi
 sed -i "s|// prejoinPageEnabled:.*|prejoinPageEnabled: true,|" "$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"
+sed -i "/$MEET_MATCH1/i \/\/ Start QJI - Set resolution and widescreen format" "$MEET_CONF"
+sed -i "/$MEET_MATCH1/i \ \ \ \ resolution: 720," "$MEET_CONF"
+sed -i "/$MEET_MATCH1/i \ \ \ \ constraints: {" "$MEET_CONF"
+sed -i "/$MEET_MATCH1/i \ \ \ \ \ \ aspectRatio: 16 \/ 9," "$MEET_CONF"
+sed -i "/$MEET_MATCH1/i \ \ \ \ \ \ \ \ \ video: {" "$MEET_CONF"
+sed -i "/$MEET_MATCH1/i \ \ \ \ \ \ \ \ \ \ \ \ \ height: {" "$MEET_CONF"
+sed -i "/$MEET_MATCH1/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ ideal: 720," "$MEET_CONF"
+sed -i "/$MEET_MATCH1/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ max: 720," "$MEET_CONF"
+sed -i "/$MEET_MATCH1/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ min: 180" "$MEET_CONF"
+sed -i "/$MEET_MATCH1/i \ \ \ \ \ \ \ \ \ \ \ \ \ }," "$MEET_CONF"
+sed -i "/$MEET_MATCH1/i \ \ \ \ \ \ \ \ \ \ \ \ \ width: {" "$MEET_CONF"
+sed -i "/$MEET_MATCH1/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ ideal: 1280," "$MEET_CONF"
+sed -i "/$MEET_MATCH1/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ max: 1280," "$MEET_CONF"
+sed -i "/$MEET_MATCH1/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ min: 320" "$MEET_CONF"
+sed -i "/$MEET_MATCH1/i \ \ \ \ \ \ \ \ \ \ \ \ \ }" "$MEET_CONF"
+sed -i "/$MEET_MATCH1/i \ \ \ \ \ \ \ \ \ }" "$MEET_CONF"
+sed -i "/$MEET_MATCH1/i \ \ \ \ \ }," "$MEET_CONF"
+sed -i "/$MEET_MATCH1/i \/\/ End QJI" "$MEET_CONF"
 
 #Check config file
 printf "\n# Checking %s file for errors\n" "$MEET_CONF"

From 725bc8dda70bd1d024e4e6abd2849d5f31bcdbe5 Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Fri, 10 Nov 2023 01:00:18 -0600
Subject: [PATCH 18/19] remove .github folder

---
 .github/FUNDING.yml | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
deleted file mode 100644
index 611be71..0000000
--- a/.github/FUNDING.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-# These are supported funding model platforms
-
-custom: ["https://www.paypal.me/switnet", switnet.net]

From 9776c5e0344ee01d8b1cf7a8af4e65f53820acaa Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Sat, 11 Nov 2023 15:41:04 -0600
Subject: [PATCH 19/19] remove name by request

---
 excalidraw-backend.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/excalidraw-backend.sh b/excalidraw-backend.sh
index a764099..ccef625 100644
--- a/excalidraw-backend.sh
+++ b/excalidraw-backend.sh
@@ -3,7 +3,6 @@
 #
 # Based on:
 # - https://community.jitsi.org/t/118883
-# by Dirk Materlik
 #
 # SwITNet Ltd © - 2023, https://switnet.net/
 # GPLv3 or later.