2021-04-12 15:55:14 +00:00
10 changed files with 709 additions and 683 deletions
--- a/add-jibri-node.sh
+++ b/add-jibri-node.sh
@ -70,8 +70,8 @@ var_dlim() {
 }

 check_var() {
-	if [ -z "$2" ]; then
-		echo -e "Check if variable $1 is set: \xE2\x9C\x96 \nExiting..."
+    if [ "$2" = "TBD" ]; then
+        echo -e "Check if variable $1 is set: \xE2\x9C\x96"
        exit
    else
        echo -e "Check if variable $1 is set: \xE2\x9C\x94"
@ -87,6 +87,48 @@ else
    ADDUP=$((LAST + 1))
 fi

+echo "
+#-----------------------------------------------------------------------
+# Checking initial necessary variables...
+#-----------------------------------------------------------------------"
+
+JMS_DATA=($MAIN_SRV_DIST \
+          $MAIN_SRV_REPO \
+          $MAIN_SRV_DOMAIN \
+          $JibriBrewery \
+          $JB_NAME \
+          $JB_AUTH_PASS \
+          $JB_REC_PASS \
+          $MJS_USER \
+          $MJS_USER_PASS)
+
+JMS_EVAL=${JMS_DATA[0]}
+for i in "${JMS_DATA[@]}"; do
+    if [[ "$JMS_EVAL" != "$i" ]]; then
+        ALL_TBD="no"
+        break
+    fi
+done
+if [ "$ALL_TBD" = "no" ];then
+ echo -e "Good, seems this is not a vanilla copy of add-jibri-node.sh,
+let's check variables ...\n"
+else
+ echo -e "You seem to be using a vanilla copy of the add-jibri-node.sh.
+  > Please use the content (or apply the changes) of add-jibri-node.sh from
+    the main Jitsi server installation folder, as it contains necessary data.\n"
+        exit
+fi
+
+check_var MAIN_SRV_DIST "$MAIN_SRV_DIST"
+check_var MAIN_SRV_REPO "$MAIN_SRV_REPO"
+check_var MAIN_SRV_DOMAIN "$MAIN_SRV_DOMAIN"
+check_var JibriBrewery "$JibriBrewery"
+check_var JB_NAME "$JB_NAME"
+check_var JB_AUTH_PASS "$JB_AUTH_PASS"
+check_var JB_REC_PASS "$JB_REC_PASS"
+check_var MJS_USER "$MJS_USER"
+check_var MJS_USER_PASS "$MJS_USER_PASS"
+
 #Check server and node OS
 if [ ! "$THIS_SRV_DIST" = "$MAIN_SRV_DIST" ]; then
    echo "Please use the same OS for the jibri setup on both servers."
@ -140,21 +182,6 @@ else
    done
 fi

-echo "
-#-----------------------------------------------------------------------
-# Checking initial necessary variables...
-#-----------------------------------------------------------------------"
-
-check_var MAIN_SRV_DIST "$MAIN_SRV_DIST"
-check_var MAIN_SRV_REPO "$MAIN_SRV_REPO"
-check_var MAIN_SRV_DOMAIN "$MAIN_SRV_DOMAIN"
-check_var JibriBrewery "$JibriBrewery"
-check_var JB_NAME "$JB_NAME"
-check_var JB_AUTH_PASS "$JB_AUTH_PASS"
-check_var JB_REC_PASS "$JB_REC_PASS"
-check_var MJS_USER "$MJS_USER"
-check_var MJS_USER_PASS "$MJS_USER_PASS"
-
 # Rename hostname for each jibri node
 hostnamectl set-hostname "jbnode${ADDUP}.${MAIN_SRV_DOMAIN}"
 sed -i "1i 127.0.0.1 jbnode${ADDUP}.${MAIN_SRV_DOMAIN}" /etc/hosts
--- a/grafana.sh
+++ b/grafana.sh
@ -51,14 +51,18 @@ WS_CONF="/etc/nginx/sites-enabled/$DOMAIN.conf"
 GRAFANA_PASS="$(tr -dc "a-zA-Z0-9#_*=" < /dev/urandom | fold -w 14 | head -n1)"

 # Min requirements
-apt update && apt install -y gnupg2 curl wget jq
+apt-get update && \
+apt-get install -y gnupg2 \
+                   curl \
+                   wget \
+                   jq

 echo "
 # Setup InfluxDB Packages
 "
 wget -qO- https://repos.influxdata.com/influxdb.key | sudo apt-key add -
 echo "deb https://repos.influxdata.com/debian buster stable" | sudo tee /etc/apt/sources.list.d/influxdb.list
-apt update && apt install influxdb -y
+apt-get update && apt-get install influxdb -y
 run_service influxdb

 echo "
@ -66,7 +70,7 @@ echo "
 "
 curl -s https://packages.grafana.com/gpg.key | sudo apt-key add -
 add-apt-repository "deb https://packages.grafana.com/oss/deb stable main"
-apt update && apt install grafana -y
+apt-get update && apt-get install grafana -y
 run_service grafana-server

 echo "
@ -74,7 +78,7 @@ echo "
 "
 wget -qO- https://repos.influxdata.com/influxdb.key | sudo apt-key add -
 echo "deb https://repos.influxdata.com/debian buster stable" | sudo tee /etc/apt/sources.list.d/influxdb.list
-apt update && apt install telegraf -y
+apt-get update && apt-get install telegraf -y
 mv /etc/telegraf/telegraf.conf /etc/telegraf/telegraf.conf.original

 echo "
--- a/jigasi.sh
+++ b/jigasi.sh
@ -56,12 +56,12 @@ apt-get -y install google-cloud-sdk google-cloud-sdk-app-engine-java
 echo "Please select one of the current options:
 [1] I want to configure a new project, service account, billing and JSON credentials.
 [2] I already have one project configured and already have a JSON key file from Google"
-while [[ $SETUP_TYPE != 1 && $SETUP_TYPE != 2 ]]
+while [[ "$SETUP_TYPE" != "1" && "$SETUP_TYPE" != "2" ]]
 do
    read -p "What option suits your setup?: (1 or 2)"$'\n' -r SETUP_TYPE
-if [ $SETUP_TYPE = 1 ]; then
+    if [ "$SETUP_TYPE" = "1" ]; then
      echo "We'll setup a GC Projects from scratch"
-elif [ $SETUP_TYPE = 2 ]; then
+    elif [ "$SETUP_TYPE" = "2" ]; then
      echo "We'll setup only the proect and JSON key."
    fi
 done
@ -84,8 +84,8 @@ while [ -z $PROJECT_GC_ID ]
 do
 read -p "Enter the project name you just created for Jigasi Speech-to-Text"$'\n' -r GC_PROJECT_NAME
 if [ -z PROJECT_GC_ID ]; then
-	echo "Please check your project name,
-	There is no project listed with the provided name: $GC_PROJECT_NAME"
+    echo "Please check your project name,"
+    echo "There is no project listed with the provided name: $GC_PROJECT_NAME"
        PROJECT_GC_ID=$(gcloud projects list | grep $GC_PROJECT_NAME | awk '{print$3}')
    fi
 done
@ -101,8 +101,8 @@ while [[ $? -eq 1 ]]
 do
 CHECK_BILLING="$(gcloud services enable speech.googleapis.com 2>/dev/null)"
 if [[ $? -eq 1 ]]; then
-        echo "Seems you haven't enabled billing for this project: $GC_PROJECT_NAME
-    For that go to: https://console.developers.google.com/project/$PROJECT_GC_ID/settings
+        echo "Seems you haven't enabled billing for this project: $GC_PROJECT_NAME"
+        exho "  For that go to: https://console.developers.google.com/project/$PROJECT_GC_ID/settings
    "
        read -p "Press Enter to continue"
        CHECK_BILLING="$(gcloud services enable speech.googleapis.com 2>/dev/null)"
@ -122,7 +122,7 @@ https://console.developers.google.com/apis/credentials?folder=&organizationId=&p
 ### End of new project configuration - Google SDK
 fi

-if [ $SETUP_TYPE = 2 ]; then
+if [ "$SETUP_TYPE" = "2" ]; then
 #Setup option 1 - Google Cloud SDK
 echo "Once logged on Google Cloud SDK, please select the project that owns to the JSON key."
 gcloud init
--- a/jitsi-updater.sh
+++ b/jitsi-updater.sh
@ -26,7 +26,7 @@ ENABLE_BLESSM="TBD"
 CHD_LTST="$(curl -sL https://chromedriver.storage.googleapis.com/LATEST_RELEASE)"
 CHD_LTST_2D="$(echo $CHD_LTST|cut -d "." -f 1,2)"
 CHDB="$(whereis chromedriver | awk '{print$2}')"
-DOMAIN="$(ls /etc/prosody/conf.d/ | grep -v localhost | awk -F'.cfg' '{print $1}' | awk '!NF || !seen[$0]++')"
+DOMAIN="$(ls /etc/prosody/conf.d|awk -F'.cfg' '!/localhost/{print $1}' | awk '!NF || !seen[$0]++')"
 NC_DOMAIN="TBD"
 JITSI_MEET_PROXY="/etc/nginx/modules-enabled/60-jitsi-meet.conf"
 if [ -f $JITSI_MEET_PROXY ];then
@ -45,7 +45,7 @@ if [ -z $CHDB ]; then
    echo "Seems no chromedriver installed"
 else
    CHD_VER_LOCAL="$($CHDB -v | awk '{print $2}')"
-    CHD_VER_2D="$(echo $CHD_VER_LOCAL|cut -d "." -f 1,2)"
+    CHD_VER_2D="$(echo $CHD_VER_LOCAL|awk '{printf "%.1f\n", $NF}')"
 fi

 # True if $1 is greater than $2
@ -85,19 +85,19 @@ update_google_repo() {
        echo "No Google repository found"
    fi
 }
-GOOGL_VER_2D="$(/usr/bin/google-chrome --version|awk '{print$3}'|cut -d "." -f 1,2)"
+GOOGL_VER_2D="$(/usr/bin/google-chrome --version|awk '{printf "%.1f\n", $NF}')"
 upgrade_cd() {
-if [ ! -z $GOOGL_VER_2D ]; then
+if [ ! -z "$GOOGL_VER_2D" ]; then
    if version_gt "$GOOGL_VER_2D" "$CHD_VER_2D" && \
    [ "$GOOGL_VER_2D" = "$CHD_LTST_2D" ]; then
        echo "Upgrading Chromedriver to Google Chromes version"
-        wget -q https://chromedriver.storage.googleapis.com/$CHD_LTST/chromedriver_linux64.zip \
+        wget -q https://chromedriver.storage.googleapis.com/"$CHD_LTST"/chromedriver_linux64.zip \
             -O /tmp/chromedriver_linux64.zip
        unzip -o /tmp/chromedriver_linux64.zip -d /usr/local/bin/
-        chown root:root $CHDB
-        chmod 0755 $CHDB
+        chown root:root "$CHDB"
+        chmod 0755 "$CHDB"
        rm -rf /tpm/chromedriver_linux64.zip
-        printf "Current version: ${Green} "$($CHDB -v | awk '{print $2}'|cut -d "." -f 1,2)" ${Color_Off}\n"
+        printf "Current version: ${Green} "$($CHDB -v |awk '{print $2}'|awk '{printf "%.1f\n", $NF}')" ${Color_Off}\n"
    else
        echo "No need to upgrade Chromedriver"
        printf "Current version: ${Green} $CHD_VER_2D ${Color_Off}\n"
@ -154,7 +154,6 @@ else
        sed -i "/RANDOM_AVATAR_URL_PREFIX/ s|false|\'http://$DOMAIN/avatar/\'|" $INT_CONF
        sed -i "/RANDOM_AVATAR_URL_SUFFIX/ s|false|\'.png\'|" $INT_CONF
    fi
-
    printf "${Purple}========== Setting Support Link  ==========${Color_Off}\n"
    if [[ -z $support ]]; then
        echo "Moving on..."
@ -162,16 +161,13 @@ else
        echo "Setting Support custom link"
        sed -i "s|https://jitsi.org/live|$support|g" $INT_CONF
    fi
-
    printf "${Purple}========== Disable Localrecording  ==========${Color_Off}\n"
    if [ "$LOC_REC" != "on" ]; then
            echo "Removing localrecording..."
            sed -i "s|'localrecording',||" $INT_CONF
    fi
-
    printf "${Purple}========== Disable Blur my background  ==========${Color_Off}\n"
    sed -i "s|'videobackgroundblur', ||" $INT_CONF
-
 fi

 if [  "$NC_DOMAIN" != "TBD" ]; then
@ -188,14 +184,12 @@ printf "${Purple}========== Enable $NC_DOMAIN for sync client ==========${Color_
        echo "$NC_DOMAIN seems to be on place, skipping..."
    fi
 fi
-
 restart_services

-
 ########################################################################
 #                         Brandless mode                               #
 ########################################################################
-if [ $ENABLE_BLESSM = on ]; then
+if [ "$ENABLE_BLESSM" = "on" ]; then
    bash $PWD/jm-bm.sh
 fi
 printf "${Blue}Script completed \o/! ${Color_Off}\n"
--- a/jm-bm.sh
+++ b/jm-bm.sh
@ -28,38 +28,38 @@ echo '
 #--------------------------------------------------
 '
 #Watermark
-if [ ! -f $WTM2_PATH ]; then
-	cp images/watermark2.png $WTM2_PATH
+if [ ! -f "$WTM2_PATH" ]; then
+    cp images/watermark2.png "$WTM2_PATH"
 else
    echo "watermark2 file exists, skipping copying..."
 fi
 #Favicon
-if [ ! -f $FICON_PATH ]; then
-	cp images/favicon2.ico $FICON_PATH
+if [ ! -f "$FICON_PATH" ]; then
+    cp images/favicon2.ico "$FICON_PATH"
 else
    echo "favicon2 file exists, skipping copying..."
 fi
 #Local recording icon
-if [ ! -f $REC_ICON_PATH ];then
-	cp images/gnome_record.png $REC_ICON_PATH
+if [ ! -f "$REC_ICON_PATH" ];then
+    cp images/gnome_record.png "$REC_ICON_PATH"
 else
        echo "recodring icon exists, skipping copying..."
 fi

 #Custom / Remove icons
-sed -i "s|watermark.png|watermark2.png|g" $CSS_FILE
-sed -i "s|favicon.ico|favicon2.ico|g" $TITLE_FILE
-sed -i "s|jitsilogo.png|watermark2.png|g" $TITLE_FILE
-sed -i "s|logo-deep-linking.png|watermark2.png|g" $BUNDLE_JS
-sed -i "s|jitsiLogo_square.png|gnome_record.png|g" $BUNDLE_JS
+sed -i "s|watermark.png|watermark2.png|g" "$CSS_FILE"
+sed -i "s|favicon.ico|favicon2.ico|g" "$TITLE_FILE"
+sed -i "s|jitsilogo.png|watermark2.png|g" "$TITLE_FILE"
+sed -i "s|logo-deep-linking.png|watermark2.png|g" "$BUNDLE_JS"
+sed -i "s|jitsiLogo_square.png|gnome_record.png|g" "$BUNDLE_JS"
 #Disable logo and url
 if [ -z "$(grep -nr ".leftwatermark{display:none" "$CSS_FILE")" ]; then
-sed -i "s|.leftwatermark{|.leftwatermark{display:none;|" $CSS_FILE
+sed -i "s|.leftwatermark{|.leftwatermark{display:none;|" "$CSS_FILE"
 fi

 #Customize room title
-sed -i "s|Jitsi Meet|$APP_NAME|g" $TITLE_FILE
-sed -i "s| powered by the Jitsi Videobridge||g" $TITLE_FILE
+sed -i "s|Jitsi Meet|$APP_NAME|g" "$TITLE_FILE"
+sed -i "s| powered by the Jitsi Videobridge||g" "$TITLE_FILE"
 sed -i "/appNotInstalled/ s|{{app}}|$MOVILE_APP_NAME|" /usr/share/jitsi-meet/lang/*

 #Custom UI changes
@ -68,12 +68,12 @@ if [ -f "$INT_CONF_ETC" ]; then
 else
    echo "This setup doesn't have a static interface_config.js, checking changes..."
    echo -e "\nPlease note that brandless mode will also overwrite support links.\n"
-	sed -i "21,32 s|Jitsi Meet|$APP_NAME|g" $INT_CONF
-	sed -i  "s|\([[:space:]]\)APP_NAME:.*| APP_NAME: \'$APP_NAME\',|" $INT_CONF
-	sed -i "s|Fellow Jitster|$PART_USER|g" $INT_CONF
-	sed -i "s|'me'|'$LOCAL_USER'|" $INT_CONF
-	sed -i "s|LIVE_STREAMING_HELP_LINK: .*|LIVE_STREAMING_HELP_LINK: '#',|g" $INT_CONF
-	sed -i "s|SUPPORT_URL: .*|SUPPORT_URL: '#',|g" $INT_CONF
+    sed -i "21,32 s|Jitsi Meet|$APP_NAME|g" "$INT_CONF"
+    sed -i  "s|\([[:space:]]\)APP_NAME:.*| APP_NAME: \'$APP_NAME\',|" "$INT_CONF"
+    sed -i "s|Fellow Jitster|$PART_USER|g" "$INT_CONF"
+    sed -i "s|'me'|'$LOCAL_USER'|" "$INT_CONF"
+    sed -i "s|LIVE_STREAMING_HELP_LINK: .*|LIVE_STREAMING_HELP_LINK: '#',|g" "$INT_CONF"
+    sed -i "s|SUPPORT_URL: .*|SUPPORT_URL: '#',|g" "$INT_CONF"
    #Logo 2
-	sed -i "s|watermark.png|watermark2.png|g" $INT_CONF
+    sed -i "s|watermark.png|watermark2.png|g" "$INT_CONF"
 fi
--- a/jra_nextcloud.sh
+++ b/jra_nextcloud.sh
@ -81,7 +81,6 @@ done
 while [ -z "$NC_PASS" ]  || [ ${#NC_PASS} -lt 6 ]
 do
    read -p "Nextcloud user password: " -r NC_PASS
-
    if [ -z "$NC_PASS" ] || [ ${#NC_PASS} -lt 6 ]; then
        echo -e "-- This field is mandatory. \nPlease make sure it's at least 6 caracters.\n"
    fi
@ -386,7 +385,7 @@ if [ "$ENABLE_HSTS" = "yes" ]; then
    sed -i "s|# add_header Strict-Transport-Security|add_header Strict-Transport-Security|g" $NC_NGINX_CONF
 fi

-if [ "$DISTRO_RELEASE" != "xenial" ] && [ ! -z $PREAD_PROXY ]; then
+if [ "$DISTRO_RELEASE" != "xenial" ] && [ ! -z "$PREAD_PROXY" ]; then
    echo "
  Setting up Nextcloud domain on Jitsi Meet turn proxy
 "
--- a/quick_jibri_installer.sh
+++ b/quick_jibri_installer.sh
@ -272,18 +272,22 @@ if [ "$LE_SSL" = "yes" ]; then
      echo "Please try again."
    fi
  done
-
  #Simple DNS test
    if [ "$PUBLIC_IP" = "$(dig -4 +short $JITSI_DOMAIN)" ]; then
        echo "Server public IP  & DNS record for $JITSI_DOMAIN seems to match, continuing...
 "
    else
       echo "Server public IP ($PUBLIC_IP) & DNS record for $JITSI_DOMAIN don't seem to match."
-    echo "Please check your dns records are applied and updated. Exiting for now...
-"
+    echo "  > Please check your dns records are applied and updated, otherwise components may fail."
+      read -p "  > Do you want to continue?: (yes or no)"$'\n' -r DNS_CONTINUE
+        if [ "$DNS_CONTINUE" = "yes" ]; then
+          echo "  - We'll continue anyway..."
+        else
+          echo "  - Exiting for now..."
          exit
        fi
  fi
+fi
 # Requirements
 echo -e "\nWe'll start by installing system requirements this may take a while please be patient...\n"
 apt-get update -q2
@ -661,7 +665,6 @@ if [ "$LE_SSL" = "yes" ]; then
    elif [ "$(curl -s -o /dev/null -w "%{http_code}" $CERTBOT_REL_FILE )" == "404" ]; then
        echo -e "\nCertbot PPA is not available for $(lsb_release -sc) just yet, it won't be installed...\n"
    fi
-
 else
    echo "SSL setup will be skipped."
 fi
@ -768,7 +771,6 @@ sed -i "$LR_STR,$LR_END{s|// localRecording: {|localRecording: {|}" $MEET_CONF
    sed -i "$LR_STR,$LR_END{s|//     enabled: true,|enabled: true,|}" $MEET_CONF
    sed -i "$LR_STR,$LR_END{s|//     format: 'flac'|format: 'flac'|}" $MEET_CONF
    sed -i "$LR_STR,$LR_END{s|// }|}|}" $MEET_CONF
-
    sed -i "s|'tileview'|'tileview', 'localrecording'|" $INT_CONF
    sed -i "s|LOC_REC=.*|LOC_REC=\"on\"|" jitsi-updater.sh
 fi
--- a/tools/test-jibri-env.sh
+++ b/tools/test-jibri-env.sh
@ -154,8 +154,8 @@ if [ -z $SND_AL_MODULE ]; then
 please try rebooting.\nFor now wait 'til the end of the recommended kernel installation."
  echo "# Check and Install HWE kernel if possible..."
  if uname -r | grep -q aws;then
-  KNL_HWE="$(apt-cache madison linux-image-generic-hwe-$(lsb_release -sr)|head -n1|awk '{print$3}'|cut -d "." -f1-4)"
-  KNL_MENU="$(awk -F\' '/menuentry / {print $2}' /boot/grub/grub.cfg | grep generic | grep -v recovery | awk '{print$3,$4}'|grep $KNL_HWE)"
+  KNL_HWE="$(apt-cache madison linux-image-generic-hwe-$(lsb_release -sr)|awk 'NR__1{print$3}'|cut -d "." -f1-4)"
+  KNL_MENU="$(awk -F\' '/menuentry / {print $2}' /boot/grub/grub.cfg|awk '!/recovery/&&/generic/{print$3,$4}'|grep $KNL_HWE)"
      if [ ! -z "$KNL_MENU" ];then
      echo -e "\nSeems you are using an AWS kernel \xE2\x9C\x96 <== IMPORTANT! \nYou might consider modify your grub (/etc/default/grub) to use the following:" && \
      echo -e "\n > $KNL_MENU"