Kaynağa Gözat

fix(debian): Improves handling db_get.

master
damencho 4 yıl önce
ebeveyn
işleme
5ac30262a5
1 değiştirilmiş dosya ile 10 ekleme ve 3 silme
  1. 10
    3
      debian/jitsi-meet-web-config.postinst

+ 10
- 3
debian/jitsi-meet-web-config.postinst Dosyayı Görüntüle

@@ -45,8 +45,9 @@ case "$1" in
45 45
 
46 46
         JVB_SERVE="false"
47 47
         # this detect only old installations
48
+        RET=""
48 49
         db_get jitsi-meet/jvb-serve || true
49
-        if [ -n "$RET" ] && [ "$RET" = "true" ] ; then
50
+        if [ "$RET" = "true" ] ; then
50 51
             JVB_SERVE="true"
51 52
         fi
52 53
 
@@ -69,19 +70,21 @@ case "$1" in
69 70
             FORCE_APACHE="true"
70 71
         fi
71 72
         # In case user enforces apache and if apache is available, unset nginx.
73
+        RET=""
72 74
         db_get jitsi-meet/enforce_apache || RET="false"
73
-        if [ -n "$RET" ] && [ "$RET" = "true" ] \
74
-            && [ "$FORCE_APACHE" = "true" ]; then
75
+        if [ "$RET" = "true" ] && [ "$FORCE_APACHE" = "true" ]; then
75 76
             FORCE_NGINX="false"
76 77
         fi
77 78
 
78 79
         UPLOADED_CERT_CHOICE="I want to use my own certificate"
79 80
         # if first time config ask for certs, or if we are reconfiguring
80 81
         if [ -z "$JVB_HOSTNAME_OLD" ] || [ "$RECONFIGURING" = "true" ] ; then
82
+            RET=""
81 83
             db_get jitsi-meet/cert-choice
82 84
             CERT_CHOICE="$RET"
83 85
 
84 86
             if [ "$CERT_CHOICE" = "$UPLOADED_CERT_CHOICE" ] ; then
87
+                RET=""
85 88
                 db_get jitsi-meet/cert-path-key
86 89
                 if [ -z "$RET" ] ; then
87 90
                     db_set jitsi-meet/cert-path-key "/etc/ssl/$JVB_HOSTNAME.key"
@@ -90,6 +93,7 @@ case "$1" in
90 93
                     db_get jitsi-meet/cert-path-key
91 94
                 fi
92 95
                 CERT_KEY="$RET"
96
+                RET=""
93 97
                 db_get jitsi-meet/cert-path-crt
94 98
                 if [ -z "$RET" ] ; then
95 99
                     db_set jitsi-meet/cert-path-crt "/etc/ssl/$JVB_HOSTNAME.crt"
@@ -152,12 +156,15 @@ case "$1" in
152 156
                 # Removing this value will force nginx or apache to be locally configured
153 157
                 JVB_HOSTNAME_OLD=""
154 158
 
159
+                RET=""
155 160
                 db_get jitsi-meet/cert-choice
156 161
                 CERT_CHOICE="$RET"
157 162
                 # Fix certs on upgrade from jetty
158 163
                 if [ "$CERT_CHOICE" = "$UPLOADED_CERT_CHOICE" ] ; then
164
+                    RET=""
159 165
                     db_get jitsi-meet/cert-path-key
160 166
                     CERT_KEY="$RET"
167
+                    RET=""
161 168
                     db_get jitsi-meet/cert-path-crt
162 169
                     CERT_CRT="$RET"
163 170
                 else

Loading…
İptal
Kaydet