haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(debian): Improves handling db_get.

This commit is contained in:
damencho 2021-01-26 09:09:46 -06:00 committed by Дамян Минков
parent 09315fa653
commit 5ac30262a5
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
debian/jitsi-meet-web-config.postinst vendored
View File

@ -45,8 +45,9 @@ case "$1" in
JVB_SERVE="false" JVB_SERVE="false"
# this detect only old installations # this detect only old installations
RET=""
db_get jitsi-meet/jvb-serve || true db_get jitsi-meet/jvb-serve || true
if [ -n "$RET" ] && [ "$RET" = "true" ] ; then if [ "$RET" = "true" ] ; then
JVB_SERVE="true" JVB_SERVE="true"
fi fi
@ -69,19 +70,21 @@ case "$1" in
FORCE_APACHE="true" FORCE_APACHE="true"
fi fi
# In case user enforces apache and if apache is available, unset nginx. # In case user enforces apache and if apache is available, unset nginx.
RET=""
db_get jitsi-meet/enforce_apache || RET="false" db_get jitsi-meet/enforce_apache || RET="false"
if [ -n "$RET" ] && [ "$RET" = "true" ] \ if [ "$RET" = "true" ] && [ "$FORCE_APACHE" = "true" ]; then
&& [ "$FORCE_APACHE" = "true" ]; then
FORCE_NGINX="false" FORCE_NGINX="false"
fi fi
UPLOADED_CERT_CHOICE="I want to use my own certificate" UPLOADED_CERT_CHOICE="I want to use my own certificate"
# if first time config ask for certs, or if we are reconfiguring # if first time config ask for certs, or if we are reconfiguring
if [ -z "$JVB_HOSTNAME_OLD" ] || [ "$RECONFIGURING" = "true" ] ; then if [ -z "$JVB_HOSTNAME_OLD" ] || [ "$RECONFIGURING" = "true" ] ; then
RET=""
db_get jitsi-meet/cert-choice db_get jitsi-meet/cert-choice
CERT_CHOICE="$RET" CERT_CHOICE="$RET"
if [ "$CERT_CHOICE" = "$UPLOADED_CERT_CHOICE" ] ; then if [ "$CERT_CHOICE" = "$UPLOADED_CERT_CHOICE" ] ; then
RET=""
db_get jitsi-meet/cert-path-key db_get jitsi-meet/cert-path-key
if [ -z "$RET" ] ; then if [ -z "$RET" ] ; then
db_set jitsi-meet/cert-path-key "/etc/ssl/$JVB_HOSTNAME.key" db_set jitsi-meet/cert-path-key "/etc/ssl/$JVB_HOSTNAME.key"
@ -90,6 +93,7 @@ case "$1" in
db_get jitsi-meet/cert-path-key db_get jitsi-meet/cert-path-key
fi fi
CERT_KEY="$RET" CERT_KEY="$RET"
RET=""
db_get jitsi-meet/cert-path-crt db_get jitsi-meet/cert-path-crt
if [ -z "$RET" ] ; then if [ -z "$RET" ] ; then
db_set jitsi-meet/cert-path-crt "/etc/ssl/$JVB_HOSTNAME.crt" db_set jitsi-meet/cert-path-crt "/etc/ssl/$JVB_HOSTNAME.crt"
@ -152,12 +156,15 @@ case "$1" in
# Removing this value will force nginx or apache to be locally configured # Removing this value will force nginx or apache to be locally configured
JVB_HOSTNAME_OLD="" JVB_HOSTNAME_OLD=""
RET=""
db_get jitsi-meet/cert-choice db_get jitsi-meet/cert-choice
CERT_CHOICE="$RET" CERT_CHOICE="$RET"
# Fix certs on upgrade from jetty # Fix certs on upgrade from jetty
if [ "$CERT_CHOICE" = "$UPLOADED_CERT_CHOICE" ] ; then if [ "$CERT_CHOICE" = "$UPLOADED_CERT_CHOICE" ] ; then
RET=""
db_get jitsi-meet/cert-path-key db_get jitsi-meet/cert-path-key
CERT_KEY="$RET" CERT_KEY="$RET"
RET=""
db_get jitsi-meet/cert-path-crt db_get jitsi-meet/cert-path-crt
CERT_CRT="$RET" CERT_CRT="$RET"
else else