From a3cc6e7b8da3f4217a268b968b420f70a4d9819b Mon Sep 17 00:00:00 2001 From: Ark74 Date: Thu, 30 Apr 2020 17:11:35 -0500 Subject: [PATCH 1/2] Setup defconf ssl let's encrypt generation --- quick_jibri_installer.sh | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/quick_jibri_installer.sh b/quick_jibri_installer.sh index 9335655..e05aff1 100644 --- a/quick_jibri_installer.sh +++ b/quick_jibri_installer.sh @@ -144,6 +144,16 @@ else echo 'deb https://download.jitsi.org stable/' > /etc/apt/sources.list.d/jitsi-stable.list wget -qO - https://download.jitsi.org/jitsi-key.gpg.key | apt-key add - fi +#Default to LE SSL? +while [[ $LE_SSL != yes && $LE_SSL != no ]] +do +read -p "> Do you plan to use Let's Encrypt SSL certs?: (yes or no)"$'\n' -r LE_SSL +if [ $LE_SSL = no ]; then + echo "We'll defaul to Let's Encrypt SSL cers." +elif [ $LE_SSL = yes ]; then + echo "We'll let you choose later on for it." +fi +done # Requirements echo "We'll start by installing system requirements this may take a while please be patient..." @@ -168,7 +178,9 @@ echo " # Install Jitsi Framework #-------------------------------------------------- " +if [ "$LE_SSL" = "yes" ]; then echo "set jitsi-meet/cert-choice select Generate a new self-signed certificate (You will later get a chance to obtain a Let's encrypt certificate)" | debconf-set-selections +fi apt-get -y install \ jitsi-meet \ jibri \ @@ -287,15 +299,19 @@ elif [ $DROP_TLS1 = yes ]; then fi done #SSL LE -while [[ $ENABLE_SSL != yes && $ENABLE_SSL != no ]] -do -read -p "> Do you want to setup LetsEncrypt with your domain: (yes or no)"$'\n' -r ENABLE_SSL -if [ $ENABLE_SSL = no ]; then - echo "Please run letsencrypt.sh manually post-installation." -elif [ $ENABLE_SSL = yes ]; then - echo "SSL will be enabled." +if [ "$LE_SSL" = "yes" ]; then + ENABLE_SSL=yes +else + while [[ $ENABLE_SSL != yes && $ENABLE_SSL != no ]] + do + read -p "> Do you want to setup LetsEncrypt with your domain: (yes or no)"$'\n' -r ENABLE_SSL + if [ $ENABLE_SSL = no ]; then + echo "Please run letsencrypt.sh manually post-installation." + elif [ $ENABLE_SSL = yes ]; then + echo "SSL will be enabled." + fi + done fi -done #Dropbox while [[ $ENABLE_DB != yes && $ENABLE_DB != no ]] do From 7665a08e0e712afedadf7a561cb91abe8f056b2f Mon Sep 17 00:00:00 2001 From: Ark74 Date: Thu, 30 Apr 2020 17:23:13 -0500 Subject: [PATCH 2/2] fix message from option --- quick_jibri_installer.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quick_jibri_installer.sh b/quick_jibri_installer.sh index e05aff1..263ba17 100644 --- a/quick_jibri_installer.sh +++ b/quick_jibri_installer.sh @@ -148,9 +148,9 @@ fi while [[ $LE_SSL != yes && $LE_SSL != no ]] do read -p "> Do you plan to use Let's Encrypt SSL certs?: (yes or no)"$'\n' -r LE_SSL -if [ $LE_SSL = no ]; then +if [ $LE_SSL = yes ]; then echo "We'll defaul to Let's Encrypt SSL cers." -elif [ $LE_SSL = yes ]; then +elif [ $LE_SSL = no ]; then echo "We'll let you choose later on for it." fi done