From b7c2159274f14d82f6c4d15e0c3c25d1ce5adbb4 Mon Sep 17 00:00:00 2001 From: Vishnu Narayanan Date: Thu, 14 Jul 2022 14:13:33 +0530 Subject: [PATCH] chore: Improve output of cwctl -w option (#5037) --- VERSION_CWCTL | 2 +- deployment/setup_20.04.sh | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/VERSION_CWCTL b/VERSION_CWCTL index 815e68dd2..09843e3be 100644 --- a/VERSION_CWCTL +++ b/VERSION_CWCTL @@ -1 +1 @@ -2.0.8 +2.0.9 diff --git a/deployment/setup_20.04.sh b/deployment/setup_20.04.sh index c48e654cb..715d61ad4 100644 --- a/deployment/setup_20.04.sh +++ b/deployment/setup_20.04.sh @@ -2,7 +2,7 @@ # Description: Install and manage a Chatwoot installation. # OS: Ubuntu 20.04 LTS -# Script Version: 2.0.8 +# Script Version: 2.0.9 # Run this script as root set -eu -o errexit -o pipefail -o noclobber -o nounset @@ -19,7 +19,7 @@ fi # option --output/-o requires 1 argument LONGOPTS=console,debug,help,install:,logs:,restart,ssl,upgrade,webserver,version OPTIONS=cdhi:l:rsuwv -CWCTL_VERSION="2.0.8" +CWCTL_VERSION="2.0.9" pg_pass=$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 15 ; echo '') # if user does not specify an option @@ -669,7 +669,9 @@ function get_logs() { # None ############################################################################## function ssl() { - echo "Setting up ssl" + if [ "$d" == "y" ]; then + echo "Setting up ssl" + fi get_domain_info if ! systemctl -q is-active nginx; then install_webserver @@ -690,7 +692,7 @@ function ssl() { function upgrade() { get_cw_version echo "Upgrading Chatwoot to v$CW_VERSION" - + sleep 3 sudo -i -u chatwoot << "EOF" # Navigate to the Chatwoot directory @@ -757,7 +759,9 @@ function restart() { # None ############################################################################## function webserver() { - echo "Installing nginx" + if [ "$d" == "y" ]; then + echo "Installing nginx" + fi ssl #TODO(@vn): allow installing nginx only without SSL }