forked from switnet/quick-jibri-installer
5.3.1
- Restore livestream as now is only visible by moderators - Rewrite jibri folder name by default using room name + date combination - Fix kernel selection, using HWE by default
This commit is contained in:
commit
6338834530
|
@ -78,6 +78,7 @@ Feel free to use our `test-jibri-env.sh` tool to find some details on your curre
|
|||
* Automatic Jibri nodes network sync ([see more](https://github.com/switnet-ltd/quick-jibri-installer/wiki/Setup-and-Jibri-Nodes)).
|
||||
* (New) JVB2 nodes network.
|
||||
* (New) JWT auth.
|
||||
* (New) Rename Jibri folder with name room + date.
|
||||
|
||||
## Tools (New)
|
||||
* Jibri Environment Tester
|
||||
|
|
|
@ -220,11 +220,10 @@ fi
|
|||
}
|
||||
|
||||
echo "# Check and Install HWE kernel if possible..."
|
||||
HWE_VIR_MOD=$(apt-cache madison linux-modules-extra-virtual-hwe-$(lsb_release -sr) 2>/dev/null|head -n1|grep -c "extra-virtual-hwe")
|
||||
if [ "$HWE_VIR_MOD" == "1" ]; then
|
||||
HWE_VIR_MOD=$(apt-cache madison linux-image-generic-hwe-$(lsb_release -sr) 2>/dev/null|head -n1|grep -c "hwe-$(lsb_release -sr)")
|
||||
if [ "$HWE_VIR_MOD" = "1" ]; then
|
||||
apt-get -y install \
|
||||
linux-image-generic-hwe-$(lsb_release -sr) \
|
||||
linux-modules-extra-virtual-hwe-$(lsb_release -sr)
|
||||
linux-image-generic-hwe-$(lsb_release -sr)
|
||||
else
|
||||
apt-get -y install \
|
||||
linux-image-generic \
|
||||
|
@ -298,6 +297,11 @@ echo "or storage provider, etc.) in this script" >> /tmp/finalize.out
|
|||
|
||||
chmod -R 770 \$RECORDINGS_DIR
|
||||
|
||||
LJF_PATH="\$(find \$RECORDINGS_DIR -exec stat --printf="%Y\t%n\n" {} \; | sort -n -r|awk '{print\$2}'| grep -v "meta\|-" | head -n1)"
|
||||
NJF_NAME="\$(find \$LJF_PATH |grep -e "-"|sed "s|\$LJF_PATH/||"|cut -d "." -f1)"
|
||||
NJF_PATH="\$RECORDINGS_DIR/\$NJF_NAME"
|
||||
mv \$LJF_PATH \$NJF_PATH
|
||||
|
||||
exit 0
|
||||
REC_DIR
|
||||
chown jibri:jibri $REC_DIR
|
||||
|
|
|
@ -293,7 +293,7 @@ sed -i "/\/\/ TOOLBAR_BUTTONS/i \ \ \ \ \ \ \ \ 'fodeviceselection', 'hangup'
|
|||
else
|
||||
sed -i "/\/\/ TOOLBAR_BUTTONS/i \ \ \ \ \ \ \ \ 'fodeviceselection', 'hangup', 'profile', 'chat', 'recording'," $INT_CONF_JS_HP
|
||||
fi
|
||||
sed -i "/\/\/ TOOLBAR_BUTTONS/i \ \ \ \ \ \ \ \ 'etherpad', 'settings', 'raisehand'," $INT_CONF_JS_HP
|
||||
sed -i "/\/\/ TOOLBAR_BUTTONS/i \ \ \ \ \ \ \ \ 'livestreaming', 'etherpad', 'settings', 'raisehand'," $INT_CONF_JS_HP
|
||||
sed -i "/\/\/ TOOLBAR_BUTTONS/i \ \ \ \ \ \ \ \ 'videoquality', 'filmstrip', 'feedback'," $INT_CONF_JS_HP
|
||||
sed -i "/\/\/ TOOLBAR_BUTTONS/i \ \ \ \ \ \ \ \ 'tileview', 'download', 'help', 'mute-everyone', 'security'" $INT_CONF_JS_HP
|
||||
sed -i "/\/\/ TOOLBAR_BUTTONS/i \ \ \ \ \]," $INT_CONF_JS_HP
|
||||
|
|
|
@ -35,7 +35,7 @@ if [ "$(dpkg-query -W -f='${Status}' $1 2>/dev/null | grep -c "ok installed")" =
|
|||
echo " This instance already has $1 installed, exiting..."
|
||||
echo " Please try again on a clean system."
|
||||
echo " If you think this is an error, please report to:
|
||||
-> https://github.com/switnet-ltd/quick-jibri-installer/issues "
|
||||
-> https://github.com/switnet-ltd/quick-jibri-installer/issues"
|
||||
exit
|
||||
fi
|
||||
}
|
||||
|
@ -271,10 +271,12 @@ 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..."
|
||||
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. Exiting for now...
|
||||
"
|
||||
exit
|
||||
fi
|
||||
# Requirements
|
||||
|
@ -298,11 +300,10 @@ apt-get -y install \
|
|||
wget
|
||||
|
||||
echo "# Check and Install HWE kernel if possible..."
|
||||
HWE_VIR_MOD=$(apt-cache madison linux-modules-extra-virtual-hwe-$(lsb_release -sr) 2>/dev/null|head -n1|grep -c "extra-virtual-hwe")
|
||||
if [ "$HWE_VIR_MOD" == "1" ]; then
|
||||
HWE_VIR_MOD=$(apt-cache madison linux-image-generic-hwe-$(lsb_release -sr) 2>/dev/null|head -n1|grep -c "hwe-$(lsb_release -sr)")
|
||||
if [ "$HWE_VIR_MOD" = "1" ]; then
|
||||
apt-get -y install \
|
||||
linux-image-generic-hwe-$(lsb_release -sr) \
|
||||
linux-modules-extra-virtual-hwe-$(lsb_release -sr)
|
||||
linux-image-generic-hwe-$(lsb_release -sr)
|
||||
else
|
||||
apt-get -y install \
|
||||
linux-image-generic \
|
||||
|
@ -799,6 +800,11 @@ echo "or storage provider, etc.) in this script" >> /tmp/finalize.out
|
|||
|
||||
chmod -R 770 \$RECORDINGS_DIR
|
||||
|
||||
LJF_PATH="\$(find \$RECORDINGS_DIR -exec stat --printf="%Y\t%n\n" {} \; | sort -n -r|awk '{print\$2}'| grep -v "meta\|-" | head -n1)"
|
||||
NJF_NAME="\$(find \$LJF_PATH |grep -e "-"|sed "s|\$LJF_PATH/||"|cut -d "." -f1)"
|
||||
NJF_PATH="\$RECORDINGS_DIR/\$NJF_NAME"
|
||||
mv \$LJF_PATH \$NJF_PATH
|
||||
|
||||
exit 0
|
||||
REC_DIR
|
||||
chown jibri:jibri $REC_DIR
|
||||
|
|
|
@ -36,7 +36,7 @@ apt-get -yq2 install apt-show-versions
|
|||
|
||||
JITSI_REPO=$(apt-cache policy | grep http | grep jitsi | grep stable | awk '{print $3}' | head -n 1 | cut -d "/" -f1)
|
||||
SND_AL_MODULE=$(lsmod | awk '{print$1}'| grep snd_aloop)
|
||||
HWE_VIR_MOD=$(apt-cache madison linux-modules-extra-virtual-hwe-$(lsb_release -sr) 2>/dev/null|head -n1|grep -c "extra-virtual-hwe")
|
||||
HWE_VIR_MOD=$(apt-cache madison linux-image-generic-hwe-$(lsb_release -sr) 2>/dev/null|head -n1|grep -c "hwe-$(lsb_release -sr)")
|
||||
CONF_JSON="/etc/jitsi/jibri/config.json"
|
||||
JIBRI_CONF="/etc/jitsi/jibri/jibri.conf"
|
||||
CHD_VER="$(/usr/local/bin/chromedriver --version 2>/dev/null| awk '{print$1,$2}')"
|
||||
|
@ -104,12 +104,12 @@ fi
|
|||
echo -e "\n#4 -- Test kernel modules --\n"
|
||||
if [ -z $SND_AL_MODULE ]; then
|
||||
#First make sure the recommended kernel is installed.
|
||||
if [ "$HWE_VIR_MOD" == "1" ]; then
|
||||
if [ "$HWE_VIR_MOD" = "1" ]; then
|
||||
apt-get -y install \
|
||||
linux-image-generic-hwe-$(lsb_release -sr) \
|
||||
linux-modules-extra-virtual-hwe-$(lsb_release -sr)
|
||||
linux-image-generic-hwe-$(lsb_release -sr)
|
||||
else
|
||||
apt-get -y install \
|
||||
linux-image-generic \
|
||||
linux-modules-extra-$(uname -r)
|
||||
fi
|
||||
echo -e "\nNo module snd_aloop detected. \xE2\x9C\x96 <== IMPORTANT! \nCurrent kernel: $(uname -r)\n"
|
||||
|
|
Loading…
Reference in New Issue