From bbfe62ce486842918d2d92f80a095b6717aff308 Mon Sep 17 00:00:00 2001 From: Ark74 Date: Wed, 28 Apr 2021 10:55:26 -0500 Subject: [PATCH 1/3] Apply permissions explicitly Remove old unused lines --- quick_jibri_installer.sh | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/quick_jibri_installer.sh b/quick_jibri_installer.sh index 7e54b0f..eb3d09d 100644 --- a/quick_jibri_installer.sh +++ b/quick_jibri_installer.sh @@ -1146,22 +1146,11 @@ if [ "$DISABLE_LOCAL_JIBRI" = "yes" ]; then systemctl disable jibri-xorg systemctl disable jibri-icewm # Manually apply permissions since finalize_recording.sh won't be triggered under this server options. - sudo -u jibri bash /home/jibri/finalize_recording.sh + chmod -R 770 $RECORDINGS_DIR fi enable_letsencrypt -if [ "$ENABLE_SC" = "yes" ];then - echo "Waiting prosody restart to continue configuration, 15s..." - wait_seconds 15 -#Move mucs when using secure rooms - https://community.jitsi.org/t/27752/112 -#Change back - https://community.jitsi.org/t/64769/136 -#sed -i "s| lobby_muc = \"lobby.|-- lobby_muc = \"lobby.|" $PROSODY_FILE -#sed -i "s| main_muc = \"conference.|-- main_muc = \"conference.|" $PROSODY_FILE - sed -i "s| muc_lobby_whitelist = { \"recorder.*| muc_lobby_whitelist = { \"recorder.$DOMAIN\", \"auth.$DOMAIN\" }|" $PROSODY_FILE -#EO_TF -fi - # Fix prosody not able to read SSL Certs chown -R root:prosody /etc/prosody/certs/ chmod -R 650 /etc/prosody/certs/ From 41b8918f07b0e7bdc9e31bccb65a5af5796841aa Mon Sep 17 00:00:00 2001 From: Ark74 Date: Wed, 28 Apr 2021 11:23:46 -0500 Subject: [PATCH 2/3] Update README --- README.md | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 976f165..d933a10 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Quick Jibri Installer -Bash installer for Jibri on **Ubuntu LTS** based systems using **nginx** as default webserver. +Bash installer for Jibri on supported **Ubuntu LTS** based systems using **nginx** as default webserver. ## Usage As for our current latest release, as we have integrated more and more features, we highly recommend to use a purpose specific-newly spawn server to host the jitsi-meet framework, making sure you stick to the requirements and recommendations as much as possible, in order to avoid issues. @@ -37,7 +37,7 @@ bash add-jvb2-node.sh Check more details on our wiki. ## Requirements -* Clean VM/VPS/Server using Ubuntu LTS +* Clean VM/VPS/Server using a supported Ubuntu LTS * Valid domain with DNS record, **mandatory** for SSL certs via Let's Encrypt. * Ports open for ACME (SSL) interaction & validation. * Highly recommended: 8 GB RAM / 4 Cores. @@ -61,20 +61,14 @@ Feel free to use our `test-jibri-env.sh` tool to find some details on your curre * Enabled Session Recording using Jibri * Enabled Jitsi Electron app detection server side. * Standalone SSL Certbot/LE implementation -* Jigasi Transcript - Speech to Text powered by Google API +* Jigasi Transcript - Speech to Text powered by Google API (stalled) * JRA (Jibri Recordings Access) via Nextcloud * Improved recurring updater * Customized brandless mode - * Setting up custom interface_config.js + * Setting up custom interface_config.js (to be deprecated by upstream) * Grafana Dashboard * Lobby Rooms via - * Local (Secure Rooms) auth - * JWT auth - * None * Conference Duration via - * Local (Secure Rooms) auth - * JWT auth - * None * Automatic Jibri nodes network sync ([see more](https://github.com/switnet-ltd/quick-jibri-installer/wiki/Setup-and-Jibri-Nodes)). * JVB2 nodes network. * JWT auth. @@ -88,7 +82,9 @@ Feel free to use our `test-jibri-env.sh` tool to find some details on your curre ## Optional custom changes * Optional default language * Option to enable Secure Rooms -* Option to enable Welcome Page +* Option to enable Welcome page +* Option to enable Close page +* Option to set domain as hostname on JMS ### Modes * Custom High Performance config @@ -97,11 +93,11 @@ Feel free to use our `test-jibri-env.sh` tool to find some details on your curre * Start with video muted by default * Start with audio muted but moderator * Set displayname as not required since jibri can't set it up. -* Disabled BETA Blur my background + ## Documentation * Please check our [wiki](https://github.com/switnet-ltd/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. -SwITNet Ltd © - 2020, https://switnet.net/ +SwITNet Ltd © - 2021, https://switnet.net/ From 56094c2c1c430e7f5054301a059f0f4955da7280 Mon Sep 17 00:00:00 2001 From: Ark74 Date: Wed, 28 Apr 2021 11:37:42 -0500 Subject: [PATCH 3/3] Deprecate requireDisplayName in favor of prejoinEnabled --- quick_jibri_installer.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/quick_jibri_installer.sh b/quick_jibri_installer.sh index eb3d09d..5ad578e 100644 --- a/quick_jibri_installer.sh +++ b/quick_jibri_installer.sh @@ -1094,12 +1094,10 @@ if [ "$ENABLE_CLOCP" = "yes" ]; then elif [ "$ENABLE_CLOCP" = "no" ]; then sed -i "s|.*enableClosePage:.*| enableClosePage: false,|" $MEET_CONF fi -#Set displayname as not required since jibri can't set it up. -sed -i "s|// requireDisplayName: true,|requireDisplayName: false,|" $MEET_CONF #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. -sed -i "s|// prejoinPageEnabled:.*|// prejoinPageEnabled: true,|" $MEET_CONF +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