Преглед на файлове

Simplifies the check for installed nginx, fixes purge when nginx was not used.

j8
damencho преди 9 години
родител
ревизия
1bb5188ac8
променени са 2 файла, в които са добавени 4 реда и са изтрити 2 реда
  1. 2
    2
      debian/jitsi-meet.postinst
  2. 2
    0
      debian/jitsi-meet.postrm

+ 2
- 2
debian/jitsi-meet.postinst Целия файл

@@ -45,8 +45,8 @@ case "$1" in
45 45
         # stores the hostname so we will reuse it later, like in purge
46 46
         db_set jitsi-meet/jvb-hostname $JVB_HOSTNAME
47 47
 
48
-        NGINX_INSTALL_CHECK="$(dpkg-query -W -f '${PackageSpec}:${Status}\n' nginx 2>&1 | grep -v "ok installed" || :)"
49
-        if [ -z "${NGINX_INSTALL_CHECK}" ]; then
48
+        NGINX_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'nginx' 2>/dev/null | awk '{print $3}' || true)"
49
+        if [ "$NGINX_INSTALL_CHECK" = "installed" ] || [ "$NGINX_INSTALL_CHECK" = "unpacked" ] ; then
50 50
             FORCE_NGINX="true"
51 51
         fi
52 52
 

+ 2
- 0
debian/jitsi-meet.postrm Целия файл

@@ -35,6 +35,8 @@ case "$1" in
35 35
             rm -f /etc/jitsi/meet/$JVB_HOSTNAME-config.js
36 36
             rm -f /etc/nginx/sites-available/$JVB_HOSTNAME.conf
37 37
             rm -f /etc/nginx/sites-enabled/$JVB_HOSTNAME.conf
38
+            rm -f /etc/jitsi/videobridge/$JVB_HOSTNAME.jks
39
+            rm -f /etc/jitsi/videobridge/$JVB_HOSTNAME.p12
38 40
         fi
39 41
     ;;
40 42
     upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)

Loading…
Отказ
Запис