feat: Drops nginx dependency for turnserver config.
We used to multiplex the ports in nginx, but we dropped that at some point, so now coturn is on its own listening and nginx dependency is no longer needed. Our turnserver config can be used with nginx | apache2.
This commit is contained in:
parent
72111114b6
commit
132b44a8b6
|
@ -54,5 +54,5 @@ Package: jitsi-meet-turnserver
|
||||||
Architecture: all
|
Architecture: all
|
||||||
Breaks: apache2
|
Breaks: apache2
|
||||||
Pre-Depends: jitsi-meet-web-config
|
Pre-Depends: jitsi-meet-web-config
|
||||||
Depends: ${misc:Depends}, nginx (>= 1.13.10) | nginx-full (>= 1.13.10) | nginx-extras (>= 1.13.10), jitsi-meet-prosody, coturn, dnsutils
|
Depends: ${misc:Depends}, jitsi-meet-prosody, coturn, dnsutils
|
||||||
Description: Configures coturn to be used with Jitsi Meet
|
Description: Configures coturn to be used with Jitsi Meet
|
||||||
|
|
|
@ -33,7 +33,6 @@ case "$1" in
|
||||||
JVB_HOSTNAME=$(echo "$RET" | xargs echo -n)
|
JVB_HOSTNAME=$(echo "$RET" | xargs echo -n)
|
||||||
|
|
||||||
TURN_CONFIG="/etc/turnserver.conf"
|
TURN_CONFIG="/etc/turnserver.conf"
|
||||||
NGINX_CONFIG="/etc/nginx/sites-available/$JVB_HOSTNAME.conf"
|
|
||||||
JITSI_MEET_CONFIG="/etc/jitsi/meet/$JVB_HOSTNAME-config.js"
|
JITSI_MEET_CONFIG="/etc/jitsi/meet/$JVB_HOSTNAME-config.js"
|
||||||
|
|
||||||
# if there was a turn config backup it so we can configure
|
# if there was a turn config backup it so we can configure
|
||||||
|
@ -51,19 +50,6 @@ case "$1" in
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# this detect only old installations with no nginx
|
|
||||||
db_get jitsi-meet/jvb-serve || true
|
|
||||||
if [ ! -f $NGINX_CONFIG -o "$RET" = "true" ] ; then
|
|
||||||
# nothing to do
|
|
||||||
echo "------------------------------------------------"
|
|
||||||
echo ""
|
|
||||||
echo "turnserver not configured"
|
|
||||||
echo ""
|
|
||||||
echo "------------------------------------------------"
|
|
||||||
db_stop
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -f $TURN_CONFIG ]] ; then
|
if [[ -f $TURN_CONFIG ]] ; then
|
||||||
echo "------------------------------------------------"
|
echo "------------------------------------------------"
|
||||||
echo ""
|
echo ""
|
||||||
|
@ -117,7 +103,7 @@ denied-peer-ip=240.0.0.0-255.255.255.255" >> $TURN_CONFIG
|
||||||
sed -i "s/jitsi-meet.example.com/$JVB_HOSTNAME/g" $TURN_CONFIG
|
sed -i "s/jitsi-meet.example.com/$JVB_HOSTNAME/g" $TURN_CONFIG
|
||||||
sed -i "s/__turnSecret__/$TURN_SECRET/g" $TURN_CONFIG
|
sed -i "s/__turnSecret__/$TURN_SECRET/g" $TURN_CONFIG
|
||||||
|
|
||||||
# SSL for nginx
|
# SSL settings
|
||||||
db_get jitsi-meet/cert-choice
|
db_get jitsi-meet/cert-choice
|
||||||
CERT_CHOICE="$RET"
|
CERT_CHOICE="$RET"
|
||||||
|
|
||||||
|
|
|
@ -23,26 +23,12 @@ set -e
|
||||||
|
|
||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
remove)
|
|
||||||
if [ -x "/etc/init.d/nginx" ]; then
|
|
||||||
invoke-rc.d nginx reload || true
|
|
||||||
fi
|
|
||||||
if [ -x "/etc/init.d/apache2" ]; then
|
|
||||||
invoke-rc.d apache2 reload || true
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
purge)
|
purge)
|
||||||
rm -rf /etc/turnserver.conf
|
rm -rf /etc/turnserver.conf
|
||||||
if [ -x "/etc/init.d/nginx" ]; then
|
|
||||||
invoke-rc.d nginx reload || true
|
|
||||||
fi
|
|
||||||
if [ -x "/etc/init.d/apache2" ]; then
|
|
||||||
invoke-rc.d apache2 reload || true
|
|
||||||
fi
|
|
||||||
# Clear the debconf variable
|
# Clear the debconf variable
|
||||||
db_purge
|
db_purge
|
||||||
;;
|
;;
|
||||||
upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
|
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
|
||||||
;;
|
;;
|
||||||
|
|
||||||
*)
|
*)
|
||||||
|
|
Loading…
Reference in New Issue