More SSO clean up on jitsi
This commit is contained in:
parent
9920d6c642
commit
993fc38838
27
lib/jitsi.sh
27
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 "\n* Configuring /federated/apps/jitsi container.."
|
||||
echo -ne "* Configuring jitsi container.."
|
||||
|
||||
if [ ! -d "/federated/apps/jitsi" ]; then
|
||||
mkdir -p /federated/apps/jitsi
|
||||
@ -696,12 +696,10 @@ mkdir -p /federated/apps/jitsi/data/config/{web,transcripts,prosody/config,proso
|
||||
/federated/apps/jitsi/gen-passwords.sh
|
||||
[ $? -ne 0 ] && fail "Couldn't run /federated/apps/jitsi/gen-passwords.sh"
|
||||
|
||||
echo -ne "done."
|
||||
echo -ne "done.\n"
|
||||
}
|
||||
email_jitsi() {
|
||||
echo -ne "* Sending email to customer.."
|
||||
spin &
|
||||
SPINPID=$!
|
||||
|
||||
cat > /federated/apps/mail/data/root/certs/mailfile <<EOF
|
||||
<html>
|
||||
@ -778,8 +776,6 @@ EOF
|
||||
}
|
||||
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
|
||||
@ -800,8 +796,8 @@ 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
|
||||
/federated/bin/stop authelia
|
||||
/federated/bin/start authelia
|
||||
run_command "/federated/bin/stop authelia"
|
||||
run_command "/federated/bin/start authelia"
|
||||
fi
|
||||
|
||||
if [[ -d "/federated/apps/jitsiopenid" ]]; then
|
||||
@ -810,7 +806,6 @@ uninstall_jitsi() {
|
||||
docker image rm mod242/jitsi-go-openid:latest &> /dev/null
|
||||
fi
|
||||
|
||||
kill -9 $SPINPID &> /dev/null
|
||||
echo -ne "done.\n"
|
||||
}
|
||||
start_jitsi() {
|
||||
@ -822,9 +817,11 @@ start_jitsi() {
|
||||
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."
|
||||
echo -ne "done.\n"
|
||||
}
|
||||
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."
|
||||
@ -854,8 +851,8 @@ cat >> /federated/apps/authelia/data/config/idproviders.yml <<EOF
|
||||
EOF
|
||||
|
||||
# Restart Authelia for changes to take the above configuration
|
||||
/federated/bin/stop authelia
|
||||
/federated/bin/start authelia
|
||||
run_command "/federated/bin/stop authelia"
|
||||
run_command "/federated/bin/start authelia"
|
||||
|
||||
sed -i "s/AUTH_TYPE=.*/AUTH_TYPE=jwt/g" /federated/apps/jitsi/.env
|
||||
sed -i "s/#JWT_APP_ID=.*/JWT_APP_ID=jitsi.$DOMAIN/g" /federated/apps/jitsi/.env
|
||||
@ -914,7 +911,7 @@ NAME_KEY=name
|
||||
EOF
|
||||
chmod 600 /federated/apps/jitsiopenid/.env
|
||||
|
||||
/federated/bin/stop jitsi
|
||||
/federated/bin/start jitsi
|
||||
/federated/bin/start jitsiopenid
|
||||
run_command "/federated/bin/stop jitsi"
|
||||
run_command "/federated/bin/start jitsi"
|
||||
run_command "/federated/bin/start jitsiopenid"
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user