From 1b4bbcba3d1d630f2a29ce8d678865bb719e74f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=B0=D0=BC=D1=8F=D0=BD=20=D0=9C=D0=B8=D0=BD=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=B2?= <damencho@jitsi.org>
Date: Sat, 24 Sep 2022 08:24:18 -0500
Subject: [PATCH] fix: Fixes jaas and cert choice when package configure is
 reordered. (#12234)

* fix: Fixes jaas and cert choice when package configure is reordered.

* squash: Checks for jaas-choice before asking.
---
 debian/jitsi-meet-prosody.postinst    | 23 +++++++++++++++++------
 debian/jitsi-meet-web-config.postinst | 13 +++++++++----
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/debian/jitsi-meet-prosody.postinst b/debian/jitsi-meet-prosody.postinst
index aeec94558d..8ff2d82a5a 100644
--- a/debian/jitsi-meet-prosody.postinst
+++ b/debian/jitsi-meet-prosody.postinst
@@ -83,17 +83,28 @@ case "$1" in
             TURN_SECRET="$RET"
         fi
 
-        db_get jitsi-meet/jaas-choice
-        JAAS_INPUT="$RET"
         # In the case of updating from an older version the configure of -prosody package may happen before the -config
         # one, so if JAAS_INPUT is empty (the question is not asked), let's ask it now.
-        if [ -z "$JAAS_INPUT" ] ; then
-            db_subst jitsi-meet/jaas-choice domain "${JVB_HOSTNAME}"
-            db_set jitsi-meet/jaas-choice false
-            db_input critical jitsi-meet/jaas-choice || true
+        db_get jitsi-meet/cert-choice
+        CERT_CHOICE="$RET"
+        if [ -z "$CERT_CHOICE" ] ; then
+            db_input critical jitsi-meet/cert-choice || true
             db_go
+            db_get jitsi-meet/cert-choice
+            CERT_CHOICE="$RET"
+        fi
+        SELF_SIGNED_CHOICE="Generate a new self-signed certificate"
+        if [ "$CERT_CHOICE" != "$SELF_SIGNED_CHOICE" ]; then
             db_get jitsi-meet/jaas-choice
             JAAS_INPUT="$RET"
+            if [ -z "$JAAS_INPUT" ] ; then
+                db_subst jitsi-meet/jaas-choice domain "${JVB_HOSTNAME}"
+                db_set jitsi-meet/jaas-choice false
+                db_input critical jitsi-meet/jaas-choice || true
+                db_go
+                db_get jitsi-meet/jaas-choice
+                JAAS_INPUT="$RET"
+            fi
         fi
 
         # and we're done with debconf
diff --git a/debian/jitsi-meet-web-config.postinst b/debian/jitsi-meet-web-config.postinst
index b53df1d423..8d6d6298db 100644
--- a/debian/jitsi-meet-web-config.postinst
+++ b/debian/jitsi-meet-web-config.postinst
@@ -137,12 +137,17 @@ case "$1" in
         fi
 
         if [ "$CERT_CHOICE" = "$LE_CERT_CHOICE" ] || [ "$CERT_CHOICE" = "$UPLOADED_CERT_CHOICE" ]; then
-            db_subst jitsi-meet/jaas-choice domain "${JVB_HOSTNAME}"
-            db_set jitsi-meet/jaas-choice false
-            db_input critical jitsi-meet/jaas-choice || true
-            db_go
+            # Make sure jaas-choice is not answered already
             db_get jitsi-meet/jaas-choice
             JAAS_INPUT="$RET"
+            if [ -z "$JAAS_INPUT" ] ; then
+                db_subst jitsi-meet/jaas-choice domain "${JVB_HOSTNAME}"
+                db_set jitsi-meet/jaas-choice false
+                db_input critical jitsi-meet/jaas-choice || true
+                db_go
+                db_get jitsi-meet/jaas-choice
+                JAAS_INPUT="$RET"
+            fi
         fi
 
         if [ "${JAAS_INPUT}" = "true" ] && ! grep -q "^var enableJaaS = true;$" $JITSI_MEET_CONFIG;  then