4.0 release merge #16

Merged
Ark74 merged 54 commits from unstable into master 2020-10-11 07:30:47 +00:00
3 changed files with 5 additions and 2 deletions
Showing only changes of commit 6423695526 - Show all commits

View File

@ -193,6 +193,8 @@ apt-get -y install \
htop \ htop \
inotify-tools \ inotify-tools \
rsync \ rsync \
ssh \
sshpass \
unzip \ unzip \
wget wget

View File

@ -91,10 +91,10 @@ fi
echo -e "\n# Check for jitsi-meet/jibri\n" echo -e "\n# Check for jitsi-meet/jibri\n"
if [ "$(dpkg-query -W -f='${Status}' jibri 2>/dev/null | grep -c "ok installed")" == "1" ] || \ if [ "$(dpkg-query -W -f='${Status}' jibri 2>/dev/null | grep -c "ok installed")" == "1" ] || \
[ -f /etc/prosody/conf.d/$DOMAIN.conf ]; then [ -f /etc/prosody/conf.d/$DOMAIN.conf ]; then
echo "jibri is installed, checking version:" echo "jitsi meet/jibri is installed, checking version:"
apt-show-versions jibri apt-show-versions jibri
else else
echo "Wait!, jibri or jitsi-meet is not installed on this system using apt, exiting..." echo "Wait!, jitsi-meet/jibri is not installed on this system using apt, exiting..."
exit exit
fi fi

View File

@ -228,6 +228,7 @@ apt-get -y install \
letsencrypt \ letsencrypt \
net-tools \ net-tools \
rsync \ rsync \
ssh \
unzip \ unzip \
wget wget