From 84af61598f2b1c0b3b7004f802067c87b10f7aad Mon Sep 17 00:00:00 2001 From: Ark74 Date: Fri, 19 Aug 2022 06:35:49 -0500 Subject: [PATCH] quick_jibri_installer.sh,jwt.sh: update anonymous string on prosody setup. fix small format issues. --- mode/jwt.sh | 2 +- quick_jibri_installer.sh | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mode/jwt.sh b/mode/jwt.sh index 73dc381..9c3ae62 100644 --- a/mode/jwt.sh +++ b/mode/jwt.sh @@ -54,7 +54,7 @@ apt-get install -y jitsi-meet-tokens #Setting up sed -i "s|c2s_require_encryption = true|c2s_require_encryption = false|" "$PROSODY_SYS" #- -sed -i "$SRP_STR,$SRP_END{s|authentication = \"anonymous\"|authentication = \"token\"|}" "$PROSODY_FILE" +sed -i "$SRP_STR,$SRP_END{s|authentication = \"jitsi-anonymous\"|authentication = \"token\"|}" "$PROSODY_FILE" sed -i "s|--app_id=\"example_app_id\"|app_id=\"$APP_ID\"|" "$PROSODY_FILE" sed -i "s|--app_secret=\"example_app_secret\"|app_secret=\"$SECRET_APP\"|" "$PROSODY_FILE" sed -i "/app_secret/a \\\\" "$PROSODY_FILE" diff --git a/quick_jibri_installer.sh b/quick_jibri_installer.sh index 061f4d9..87f2c1a 100644 --- a/quick_jibri_installer.sh +++ b/quick_jibri_installer.sh @@ -172,13 +172,13 @@ if [ "$DIST" = "bionic" ]; then fi #Check system resources -echo "Verifying System Resources:" +printf "\n\nVerifying System Resources:" if [ "$(nproc --all)" -lt 4 ];then printf "\nWarning!: The system do not meet the minimum CPU requirements for Jibri to run." - printf "\n>> We recommend 4 cores/threads for Jibri!\n\n" + printf "\n>> We recommend 4 cores/threads for Jibri!\n" CPU_MIN="N" else - printf "\nCPU Cores/Threads: OK (%s)\n\n" "$(nproc --all)" + printf "\nCPU Cores/Threads: OK (%s)\n" "$(nproc --all)" CPU_MIN="Y" fi sleep .1 @@ -189,7 +189,7 @@ if [ "$mem_available" -lt 7700000 ]; then printf "\n>> We recommend 8GB RAM for Jibri!\n\n" MEM_MIN="N" else - printf "\nMemory: OK (%s) MiB)\n\n" "$(mem_available/1024)" + printf "\nMemory: OK (%s) MiB\n\n" "$((mem_available/1024))" MEM_MIN="Y" fi sleep .1 @@ -1058,7 +1058,7 @@ if [ "$ENABLE_SA" = "yes" ] && [ -f "$WS_CONF" ]; then fi #nginx -tlsv1/1.1 if [ "$DROP_TLS1" = "yes" ];then - printf "\nDropping TLSv1/1.1\\nn" + printf "\nDropping TLSv1/1.1\n\n" sed -i "s|TLSv1 TLSv1.1||" /etc/nginx/nginx.conf elif [ "$DROP_TLS1" = "no" ];then printf "\nNo TLSv1/1.1 dropping was done.\n\n" @@ -1073,7 +1073,7 @@ sleep .1 if [ "$ENABLE_SC" = "yes" ]; then SRP_STR=$(grep -n "VirtualHost \"$DOMAIN\"" "$PROSODY_FILE" | awk -F ':' 'NR==1{print$1}') SRP_END=$((SRP_STR + 10)) - sed -i "$SRP_STR,$SRP_END{s|authentication = \"anonymous\"|authentication = \"internal_hashed\"|}" "$PROSODY_FILE" + sed -i "$SRP_STR,$SRP_END{s|authentication = \"jitsi-anonymous\"|authentication = \"internal_hashed\"|}" "$PROSODY_FILE" sed -i "s|// anonymousdomain: 'guest.example.com'|anonymousdomain: \'guest.$DOMAIN\'|" "$MEET_CONF" #Secure room initial user