Parcourir la source

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.
master
Дамян Минков il y a 3 ans
Parent
révision
132b44a8b6
3 fichiers modifiés avec 3 ajouts et 31 suppressions
  1. 1
    1
      debian/control
  2. 1
    15
      debian/jitsi-meet-turnserver.postinst
  3. 1
    15
      debian/jitsi-meet-turnserver.postrm

+ 1
- 1
debian/control Voir le fichier

@@ -54,5 +54,5 @@ Package: jitsi-meet-turnserver
54 54
 Architecture: all
55 55
 Breaks: apache2
56 56
 Pre-Depends: jitsi-meet-web-config
57
-Depends: ${misc:Depends}, nginx (>= 1.13.10) | nginx-full (>= 1.13.10) | nginx-extras (>= 1.13.10), jitsi-meet-prosody, coturn, dnsutils
57
+Depends: ${misc:Depends}, jitsi-meet-prosody, coturn, dnsutils
58 58
 Description: Configures coturn to be used with Jitsi Meet

+ 1
- 15
debian/jitsi-meet-turnserver.postinst Voir le fichier

@@ -33,7 +33,6 @@ case "$1" in
33 33
         JVB_HOSTNAME=$(echo "$RET" | xargs echo -n)
34 34
 
35 35
         TURN_CONFIG="/etc/turnserver.conf"
36
-        NGINX_CONFIG="/etc/nginx/sites-available/$JVB_HOSTNAME.conf"
37 36
         JITSI_MEET_CONFIG="/etc/jitsi/meet/$JVB_HOSTNAME-config.js"
38 37
 
39 38
         # if there was a turn config backup it so we can configure
@@ -51,19 +50,6 @@ case "$1" in
51 50
             fi
52 51
         fi
53 52
 
54
-        # this detect only old installations with no nginx
55
-        db_get jitsi-meet/jvb-serve || true
56
-        if [ ! -f $NGINX_CONFIG -o "$RET" = "true" ] ; then
57
-            # nothing to do
58
-            echo "------------------------------------------------"
59
-            echo ""
60
-            echo "turnserver not configured"
61
-            echo ""
62
-            echo "------------------------------------------------"
63
-            db_stop
64
-            exit 0
65
-        fi
66
-
67 53
         if [[ -f $TURN_CONFIG ]] ; then
68 54
             echo "------------------------------------------------"
69 55
             echo ""
@@ -117,7 +103,7 @@ denied-peer-ip=240.0.0.0-255.255.255.255" >> $TURN_CONFIG
117 103
         sed -i "s/jitsi-meet.example.com/$JVB_HOSTNAME/g" $TURN_CONFIG
118 104
         sed -i "s/__turnSecret__/$TURN_SECRET/g" $TURN_CONFIG
119 105
 
120
-        # SSL for nginx
106
+        # SSL settings
121 107
         db_get jitsi-meet/cert-choice
122 108
         CERT_CHOICE="$RET"
123 109
 

+ 1
- 15
debian/jitsi-meet-turnserver.postrm Voir le fichier

@@ -23,26 +23,12 @@ set -e
23 23
 
24 24
 
25 25
 case "$1" in
26
-    remove)
27
-        if [ -x "/etc/init.d/nginx" ]; then
28
-            invoke-rc.d nginx reload || true
29
-        fi
30
-        if [ -x "/etc/init.d/apache2" ]; then
31
-            invoke-rc.d apache2 reload || true
32
-        fi
33
-    ;;
34 26
     purge)
35 27
         rm -rf /etc/turnserver.conf
36
-        if [ -x "/etc/init.d/nginx" ]; then
37
-            invoke-rc.d nginx reload || true
38
-        fi
39
-        if [ -x "/etc/init.d/apache2" ]; then
40
-            invoke-rc.d apache2 reload || true
41
-        fi
42 28
         # Clear the debconf variable
43 29
         db_purge
44 30
     ;;
45
-    upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
31
+    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
46 32
     ;;
47 33
 
48 34
     *)

Chargement…
Annuler
Enregistrer