From 20e1f7b3627e1a8855f1aec4cd8b14e4c1ef446b Mon Sep 17 00:00:00 2001 From: Ark74 Date: Wed, 8 Nov 2023 01:12:27 -0600 Subject: [PATCH] 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 \\