From 2ac5d136dc82ac7d333e3e5d721047951f516dae Mon Sep 17 00:00:00 2001 From: damencho Date: Thu, 14 Feb 2019 11:00:59 +0000 Subject: [PATCH] Detects nginx-extras package. Fixes #3891. --- debian/control | 2 +- debian/jitsi-meet-web-config.postinst | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index ae6fb168ea..c4d269b9f4 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,7 @@ Description: WebRTC JavaScript video conferences Package: jitsi-meet-web-config Architecture: all -Depends: openssl, openjdk-8-jre-headless | nginx | apache2 +Depends: openssl, openjdk-8-jre-headless | nginx | nginx-extras | apache2 Description: Configuration for web serving of Jitsi Meet Jitsi Meet is a WebRTC JavaScript application that uses Jitsi Videobridge to provide high quality, scalable video conferences. diff --git a/debian/jitsi-meet-web-config.postinst b/debian/jitsi-meet-web-config.postinst index 355d316126..aeacdd2477 100644 --- a/debian/jitsi-meet-web-config.postinst +++ b/debian/jitsi-meet-web-config.postinst @@ -52,7 +52,11 @@ case "$1" in db_set jitsi-meet/jvb-hostname $JVB_HOSTNAME NGINX_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'nginx' 2>/dev/null | awk '{print $3}' || true)" - if [ "$NGINX_INSTALL_CHECK" = "installed" ] || [ "$NGINX_INSTALL_CHECK" = "unpacked" ] ; then + NGINX_EXTRAS_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'nginx-extras' 2>/dev/null | awk '{print $3}' || true)" + if [ "$NGINX_INSTALL_CHECK" = "installed" ] \ + || [ "$NGINX_INSTALL_CHECK" = "unpacked" ] \ + || [ "$NGINX_EXTRAS_INSTALL_CHECK" = "installed" ] \ + || [ "$NGINX_EXTRAS_INSTALL_CHECK" = "unpacked" ] ; then FORCE_NGINX="true" fi APACHE_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'apache2' 2>/dev/null | awk '{print $3}' || true)"