Pārlūkot izejas kodu

Detects nginx-extras package. Fixes #3891.

master
damencho 6 gadus atpakaļ
vecāks
revīzija
2ac5d136dc
2 mainītis faili ar 6 papildinājumiem un 2 dzēšanām
  1. 1
    1
      debian/control
  2. 5
    1
      debian/jitsi-meet-web-config.postinst

+ 1
- 1
debian/control Parādīt failu

21
 
21
 
22
 Package: jitsi-meet-web-config
22
 Package: jitsi-meet-web-config
23
 Architecture: all
23
 Architecture: all
24
-Depends: openssl, openjdk-8-jre-headless | nginx | apache2
24
+Depends: openssl, openjdk-8-jre-headless | nginx | nginx-extras | apache2
25
 Description: Configuration for web serving of Jitsi Meet
25
 Description: Configuration for web serving of Jitsi Meet
26
  Jitsi Meet is a WebRTC JavaScript application that uses Jitsi
26
  Jitsi Meet is a WebRTC JavaScript application that uses Jitsi
27
  Videobridge to provide high quality, scalable video conferences.
27
  Videobridge to provide high quality, scalable video conferences.

+ 5
- 1
debian/jitsi-meet-web-config.postinst Parādīt failu

52
         db_set jitsi-meet/jvb-hostname $JVB_HOSTNAME
52
         db_set jitsi-meet/jvb-hostname $JVB_HOSTNAME
53
 
53
 
54
         NGINX_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'nginx' 2>/dev/null | awk '{print $3}' || true)"
54
         NGINX_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'nginx' 2>/dev/null | awk '{print $3}' || true)"
55
-        if [ "$NGINX_INSTALL_CHECK" = "installed" ] || [ "$NGINX_INSTALL_CHECK" = "unpacked" ] ; then
55
+        NGINX_EXTRAS_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'nginx-extras' 2>/dev/null | awk '{print $3}' || true)"
56
+        if [ "$NGINX_INSTALL_CHECK" = "installed" ] \
57
+           || [ "$NGINX_INSTALL_CHECK" = "unpacked" ] \
58
+           || [ "$NGINX_EXTRAS_INSTALL_CHECK" = "installed" ] \
59
+           || [ "$NGINX_EXTRAS_INSTALL_CHECK" = "unpacked" ] ; then
56
             FORCE_NGINX="true"
60
             FORCE_NGINX="true"
57
         fi
61
         fi
58
         APACHE_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'apache2' 2>/dev/null | awk '{print $3}' || true)"
62
         APACHE_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'apache2' 2>/dev/null | awk '{print $3}' || true)"

Notiek ielāde…
Atcelt
Saglabāt