From 8f72fe6390cc4f9dbc16128d9e2563dd02469c7d Mon Sep 17 00:00:00 2001 From: root Date: Wed, 6 Nov 2024 19:08:23 +0000 Subject: [PATCH] Fixed jitsi for merge --- lib/jitsi.sh | 84 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 61 insertions(+), 23 deletions(-) diff --git a/lib/jitsi.sh b/lib/jitsi.sh index 712d87d..774c572 100644 --- a/lib/jitsi.sh +++ b/lib/jitsi.sh @@ -6,7 +6,7 @@ PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sb get_appvars config_jitsi() { - echo -ne "* Configuring jitsi container.." + echo -ne "\n* Configuring /federated/apps/jitsi container.." if [ ! -d "/federated/apps/jitsi" ]; then mkdir -p /federated/apps/jitsi @@ -429,12 +429,19 @@ cat > /federated/apps/jitsi/.env <> /federated/apps/jitsi/.env <> /federated/apps/jitsi/.env <> /federated/apps/jitsi/.env <> /federated/apps/jitsi/.env <> /federated/apps/jitsi/.env <> /federated/apps/jitsi/.env <> /federated/apps/jitsi/.env <> /federated/apps/jitsi/.env < /federated/apps/mail/data/root/certs/mailfile < @@ -740,13 +773,16 @@ EOF docker exec mail bash -c "mail -r admin@$DOMAIN -a \"Content-type: text/html\" -s \"Application installed on $DOMAIN\" $EMAIL < /root/certs/mailfile" rm /federated/apps/mail/data/root/certs/mailfile + kill -9 $SPINPID &> /dev/null echo -ne "done.\n" } uninstall_jitsi() { echo -ne "* Uninstalling jitsi container.." + spin & + SPINPID=$! # First stop the service - cd /federated/apps/jitsi && docker-compose -f docker-compose.yml -p jitsi down &> /dev/null + cd /federated/apps/jitsi && docker compose -f docker-compose.yml -p jitsi down &> /dev/null # Delete the app directory rm -rf /federated/apps/jitsi @@ -764,27 +800,31 @@ uninstall_jitsi() { if [[ $(grep "### Jitsi" /federated/apps/authelia/data/config/idproviders.yml 2>/dev/null) ]]; then sed -i '/### Jitsi/,/### /{/### PowerDNS/!{/### /!d}}' /federated/apps/authelia/data/config/idproviders.yml sed -i '/### Jitsi/d' /federated/apps/authelia/data/config/idproviders.yml - run_command "/federated/bin/stop authelia" - run_command "/federated/bin/start authelia" + /federated/bin/stop authelia + /federated/bin/start authelia fi if [[ -d "/federated/apps/jitsiopenid" ]]; then - cd /federated/apps/jitsiopenid && docker-compose -f docker-compose.yml -p jitsiopenid down &> /dev/null + cd /federated/apps/jitsiopenid && docker compose -f docker-compose.yml -p jitsiopenid down &> /dev/null rm -rf /federated/apps/jitsiopenid docker image rm mod242/jitsi-go-openid:latest &> /dev/null fi + kill -9 $SPINPID &> /dev/null echo -ne "done.\n" } start_jitsi() { # Start service with command to make sure it's up before proceeding start_service "jitsi" "nc -z 192.168.0.25 443 &> /dev/null" "8" - - echo -ne "done.\n" + # Allow multiple JVBs to connect + if [ "$JITSI_SCALE" = "client" ]; then + for i in $(seq 1 10); do + docker exec -ti jitsi-prosody-1 prosodyctl --config /config/prosody.cfg.lua register jvb$i auth.jitsiscale.federated.computer J17515cAl3-jvb + done + fi + echo -ne "done." } configsso_jitsi() { - echo -ne "* Configuring jitsi container with SSO.." - [ ! -d "/federated/apps/authelia" ] && failcheck "Authelia is not installed. You need this first before continuing." [ ! -f "/federated/apps/authelia/data/config/idproviders.yml" ] && failcheck "Authelia idproviders.yml is missing." [[ $(grep "### Jitsi" /federated/apps/authelia/data/config/idproviders.yml 2>/dev/null) ]] && failcheck "Authelia already has a Jitsi configuration." @@ -814,8 +854,8 @@ cat >> /federated/apps/authelia/data/config/idproviders.yml <