Explorar el Código

Fixes updates on distributions that are missing openjdk 8.

master
damencho hace 10 años
padre
commit
a701821698
Se han modificado 2 ficheros con 8 adiciones y 1 borrados
  1. 1
    1
      debian/control
  2. 7
    0
      debian/jitsi-meet.postinst

+ 1
- 1
debian/control Ver fichero

11
 Package: jitsi-meet
11
 Package: jitsi-meet
12
 Architecture: all
12
 Architecture: all
13
 Depends: ${misc:Depends}, jitsi-videobridge, jitsi-meet-prosody, libjs-strophe (>= 1.1.3),
13
 Depends: ${misc:Depends}, jitsi-videobridge, jitsi-meet-prosody, libjs-strophe (>= 1.1.3),
14
- libjs-jquery, libjs-jquery-ui, openjdk-8-jre-headless
14
+ libjs-jquery, libjs-jquery-ui, openjdk-8-jre-headless | nginx
15
 Description: WebRTC JavaScript video conferences
15
 Description: WebRTC JavaScript video conferences
16
  Jitsi Meet is a WebRTC JavaScript application that uses Jitsi
16
  Jitsi Meet is a WebRTC JavaScript application that uses Jitsi
17
  Videobridge to provide high quality, scalable video conferences.
17
  Videobridge to provide high quality, scalable video conferences.

+ 7
- 0
debian/jitsi-meet.postinst Ver fichero

46
         # stores the hostname so we will reuse it later, like in purge
46
         # stores the hostname so we will reuse it later, like in purge
47
         db_set jitsi-meet/jvb-hostname $JVB_HOSTNAME
47
         db_set jitsi-meet/jvb-hostname $JVB_HOSTNAME
48
 
48
 
49
+        NGINX_INSTALL_CHECK="$(dpkg-query -W -f '${PackageSpec}:${Status}\n' nginx 2>&1 | grep -v "ok installed" || :)"
50
+        if [ -n "${NGINX_INSTALL_CHECK}" ]; then
51
+            FORCE_NGINX="false"
52
+        else
53
+            FORCE_NGINX="true"
54
+        fi
55
+
49
         # SSL for nginx
56
         # SSL for nginx
50
         db_get jitsi-meet/cert-choice
57
         db_get jitsi-meet/cert-choice
51
         CERT_CHOICE="$RET"
58
         CERT_CHOICE="$RET"

Loading…
Cancelar
Guardar