Parcourir la source

Fix turn file link (#5601)

* debian: Does not add a link of turnserver will not be configured. Fixes #5596.

* debian: Partially reverts 990c77bd.

* debian: Skip filename duplication, use variable.
master
Дамян Минков il y a 5 ans
Parent
révision
b372b2ccf2
Aucun compte lié à l'adresse e-mail de l'auteur

+ 0
- 1
debian/jitsi-meet-turnserver.links Voir le fichier

1
-/usr/share/jitsi-meet-turnserver/jitsi-meet.conf /etc/nginx/modules-enabled/60-jitsi-meet.conf

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

46
             # check whether other enabled hosts has listen 443
46
             # check whether other enabled hosts has listen 443
47
             if cat ${site} | grep -v "^[[:space:]]*#" | grep listen | grep -q "^.*[[:space:]:]443[;[:space:]].*" ; then
47
             if cat ${site} | grep -v "^[[:space:]]*#" | grep listen | grep -q "^.*[[:space:]:]443[;[:space:]].*" ; then
48
                 # nothing to do
48
                 # nothing to do
49
+                echo "------------------------------------------------"
49
                 echo ""
50
                 echo ""
50
                 echo "turnserver not configured as other nginx sites use port 443"
51
                 echo "turnserver not configured as other nginx sites use port 443"
51
                 echo ""
52
                 echo ""
53
+                echo "------------------------------------------------"
52
                 db_stop
54
                 db_stop
53
                 exit 0
55
                 exit 0
54
             fi
56
             fi
55
         done
57
         done
56
 
58
 
59
+        # if there was a turn config backup it so we can configure
60
+        # we cannot recognize at the moment is this a user config or default config when installing coturn
61
+        if [[ -f $TURN_CONFIG ]] && ! grep -q "jitsi-meet coturn config" "$TURN_CONFIG" ; then
62
+            mv $TURN_CONFIG $TURN_CONFIG.bak
63
+        fi
64
+
57
         # detect dpkg-reconfigure, just delete old links
65
         # detect dpkg-reconfigure, just delete old links
58
         db_get jitsi-meet-turnserver/jvb-hostname
66
         db_get jitsi-meet-turnserver/jvb-hostname
59
         JVB_HOSTNAME_OLD=$RET
67
         JVB_HOSTNAME_OLD=$RET
67
         db_get jitsi-meet/jvb-serve || true
75
         db_get jitsi-meet/jvb-serve || true
68
         if [ ! -f $NGINX_CONFIG -o "$RET" = "true" ] ; then
76
         if [ ! -f $NGINX_CONFIG -o "$RET" = "true" ] ; then
69
             # nothing to do
77
             # nothing to do
78
+            echo "------------------------------------------------"
70
             echo ""
79
             echo ""
71
             echo "turnserver not configured as no nginx found to multiplex traffic"
80
             echo "turnserver not configured as no nginx found to multiplex traffic"
72
             echo ""
81
             echo ""
82
+            echo "------------------------------------------------"
73
             db_stop
83
             db_stop
74
             exit 0
84
             exit 0
75
         fi
85
         fi
76
 
86
 
77
         if [[ -f $TURN_CONFIG ]] ; then
87
         if [[ -f $TURN_CONFIG ]] ; then
88
+            echo "------------------------------------------------"
78
             echo ""
89
             echo ""
79
             echo "turnserver is already configured on this machine, skipping."
90
             echo "turnserver is already configured on this machine, skipping."
80
             echo ""
91
             echo ""
92
+            echo "------------------------------------------------"
81
             db_stop
93
             db_stop
82
             exit 0
94
             exit 0
83
         fi
95
         fi
130
         invoke-rc.d coturn restart || true
142
         invoke-rc.d coturn restart || true
131
 
143
 
132
         NGINX_STREAM_CONFIG="/etc/nginx/modules-enabled/60-jitsi-meet.conf"
144
         NGINX_STREAM_CONFIG="/etc/nginx/modules-enabled/60-jitsi-meet.conf"
133
-        if [ -f $NGINX_STREAM_CONFIG ] && [ -f $NGINX_CONFIG ] ; then
145
+        if [ ! -f $NGINX_STREAM_CONFIG ] && [ -f $NGINX_CONFIG ] ; then
146
+            ln -s /usr/share/jitsi-meet-turnserver/jitsi-meet.conf $NGINX_STREAM_CONFIG
134
             sed -i "s/listen 443 ssl/listen 4444 ssl http2/g" $NGINX_CONFIG
147
             sed -i "s/listen 443 ssl/listen 4444 ssl http2/g" $NGINX_CONFIG
135
             sed -i "s/listen \[\:\:\]\:443 ssl/listen \[\:\:\]\:4444 ssl http2/g" $NGINX_CONFIG
148
             sed -i "s/listen \[\:\:\]\:443 ssl/listen \[\:\:\]\:4444 ssl http2/g" $NGINX_CONFIG
136
             invoke-rc.d nginx reload || true
149
             invoke-rc.d nginx reload || true

+ 3
- 0
debian/jitsi-meet-turnserver.postrm Voir le fichier

24
 
24
 
25
 case "$1" in
25
 case "$1" in
26
     remove)
26
     remove)
27
+        rm -rf /etc/nginx/modules-enabled/60-jitsi-meet.conf
27
         if [ -x "/etc/init.d/nginx" ]; then
28
         if [ -x "/etc/init.d/nginx" ]; then
28
             invoke-rc.d nginx reload || true
29
             invoke-rc.d nginx reload || true
29
         fi
30
         fi
32
         fi
33
         fi
33
     ;;
34
     ;;
34
     purge)
35
     purge)
36
+        rm -rf /etc/nginx/modules-enabled/60-jitsi-meet.conf
37
+        rm -rf /etc/turnserver.conf
35
         if [ -x "/etc/init.d/nginx" ]; then
38
         if [ -x "/etc/init.d/nginx" ]; then
36
             invoke-rc.d nginx reload || true
39
             invoke-rc.d nginx reload || true
37
         fi
40
         fi

Chargement…
Annuler
Enregistrer