Add upstream fixes

This commit is contained in:
Luis Guzmán 2019-04-01 14:29:03 -06:00
parent e4d772d345
commit 4fb8a6e17a
No known key found for this signature in database
GPG Key ID: BE0F0FDD8926E0C5
1 changed files with 21 additions and 10 deletions

View File

@ -14,6 +14,14 @@ GOOGL_REPO="/etc/apt/sources.list.d/dl_google_com_linux_chrome_deb.list"
if [ $DIST = flidas ]; then if [ $DIST = flidas ]; then
DIST="xenial" DIST="xenial"
fi fi
install_ifnot() {
if [ "$(dpkg-query -W -f='${Status}' $1 2>/dev/null | grep -c "ok installed")" == "1" ]; then
echo " $1 is installed, skipping..."
else
echo -e "\n---- Installing $1 ----"
apt -yqq install $1
fi
}
check_serv() { check_serv() {
if [ "$APACHE_2" -eq 1 ] || [ "$NGINX" -eq 1 ]; then if [ "$APACHE_2" -eq 1 ] || [ "$NGINX" -eq 1 ]; then
echo " echo "
@ -27,7 +35,7 @@ else
echo " echo "
Installing nginx as webserver! Installing nginx as webserver!
" "
apt -yqq install nginx python3-certbot-nginx apt -yqq install nginx
fi fi
} }
check_snd_driver() { check_snd_driver() {
@ -124,7 +132,6 @@ fi
# ALSA - Loopback # ALSA - Loopback
echo "snd-aloop" | tee -a /etc/modules echo "snd-aloop" | tee -a /etc/modules
check_snd_driver check_snd_driver
CHD_VER=$(curl -sL https://chromedriver.storage.googleapis.com/LATEST_RELEASE) CHD_VER=$(curl -sL https://chromedriver.storage.googleapis.com/LATEST_RELEASE)
echo "# Installing Google Chrome / ChromeDriver" echo "# Installing Google Chrome / ChromeDriver"
@ -174,16 +181,10 @@ REC_DIR=/home/jibri/finalize_recording.sh
JB_NAME="Jibri Sessions" JB_NAME="Jibri Sessions"
read -p "Jibri internal.auth.$DOMAIN password: "$'\n' -sr JB_AUTH_PASS read -p "Jibri internal.auth.$DOMAIN password: "$'\n' -sr JB_AUTH_PASS
read -p "Jibri recorder.$DOMAIN password: "$'\n' -sr JB_REC_PASS read -p "Jibri recorder.$DOMAIN password: "$'\n' -sr JB_REC_PASS
#Secure room initial user
read -p "Set username for secure room moderator: "$'\n' -r SEC_ROOM_USER
read -p "Secure room moderator password: "$'\n' -sr SEC_ROOM_PASS
echo "You'll be able to login Secure Room chat with '${SEC_ROOM_USER}' \
or '${SEC_ROOM_USER}@${DOMAIN}' using the password you just entered.
If you have issues with the password refer to your sysadmin."
read -p "Set sysadmin email: "$'\n' -r SYSADMIN_EMAIL read -p "Set sysadmin email: "$'\n' -r SYSADMIN_EMAIL
while [[ $ENABLE_DB != yes && $ENABLE_DB != no ]] while [[ $ENABLE_DB != yes && $ENABLE_DB != no ]]
do do
read -p "Do you want to setup the Dropbox feature: (yes or no)"$'\n' -r ENABLE_DB read -p "Do you want to setup the Dropbox feature now: (yes or no)"$'\n' -r ENABLE_DB
if [ $ENABLE_DB = no ]; then if [ $ENABLE_DB = no ]; then
echo "Dropbox won't be enable" echo "Dropbox won't be enable"
elif [ $ENABLE_DB = yes ]; then elif [ $ENABLE_DB = yes ]; then
@ -234,8 +235,11 @@ update_certbot
if [ "$APACHE_2" -eq 1 ]; then if [ "$APACHE_2" -eq 1 ]; then
ssl_wa apache2 apache ssl_wa apache2 apache
install_ifnot python3-certbot-apache
elif [ "$NGINX" -eq 1 ]; then elif [ "$NGINX" -eq 1 ]; then
ssl_wa nginx nginx ssl_wa nginx nginx
install_ifnot python3-certbot-nginx
fi fi
else else
@ -296,6 +300,7 @@ cat << BREWERY >> $JICOFO_SIP
org.jitsi.jicofo.auth.URL=XMPP:$DOMAIN org.jitsi.jicofo.auth.URL=XMPP:$DOMAIN
org.jitsi.jicofo.jibri.BREWERY=$JibriBrewery@internal.auth.$DOMAIN org.jitsi.jicofo.jibri.BREWERY=$JibriBrewery@internal.auth.$DOMAIN
org.jitsi.jicofo.jibri.PENDING_TIMEOUT=90 org.jitsi.jicofo.jibri.PENDING_TIMEOUT=90
#org.jitsi.jicofo.auth.DISABLE_AUTOLOGIN=true
BREWERY BREWERY
# Jibri tweaks for /etc/jitsi/meet/$DOMAIN-config.js # Jibri tweaks for /etc/jitsi/meet/$DOMAIN-config.js
@ -471,6 +476,12 @@ if [ "$ENABLE_SC" = "no" ]; then
echo "Secure rooms won't be enable" echo "Secure rooms won't be enable"
elif [ "$ENABLE_SC" = "yes" ]; then elif [ "$ENABLE_SC" = "yes" ]; then
echo "Secure rooms are being enable" echo "Secure rooms are being enable"
#Secure room initial user
read -p "Set username for secure room moderator: "$'\n' -r SEC_ROOM_USER
read -p "Secure room moderator password: "$'\n' -sr SEC_ROOM_PASS
echo "You'll be able to login Secure Room chat with '${SEC_ROOM_USER}' \
or '${SEC_ROOM_USER}@${DOMAIN}' using the password you just entered.
If you have issues with the password refer to your sysadmin."
cat << P_SR >> $PROSODY_FILE cat << P_SR >> $PROSODY_FILE
VirtualHost "$DOMAIN" VirtualHost "$DOMAIN"
authentication = "internal_plain" authentication = "internal_plain"
@ -479,7 +490,7 @@ VirtualHost "guest.$DOMAIN"
authentication = "anonymous" authentication = "anonymous"
c2s_require_encryption = false c2s_require_encryption = false
P_SR P_SR
prosodyctl register $SEC_ROOM_USER $DOMAIN $SEC_ROOM_PASS prosodyctl register $SEC_ROOM_USER $DOMAIN $SEC_ROOM_PASS
fi fi
done done