KumiSystems/Chatwoot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chore: Improve output of cwctl -w option (#5037)

Browse source
This commit is contained in:
Vishnu Narayanan 2022-07-14 14:13:33 +05:30 committed by GitHub
parent 8dd0d514fd
commit b7c2159274
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION_CWCTL
View file

@ -1 +1 @@
2.0.8 2.0.9

14
deployment/setup_20.04.sh
View file

@ -2,7 +2,7 @@
# Description: Install and manage a Chatwoot installation. # Description: Install and manage a Chatwoot installation.
# OS: Ubuntu 20.04 LTS # OS: Ubuntu 20.04 LTS
# Script Version: 2.0.8 # Script Version: 2.0.9
# Run this script as root # Run this script as root
set -eu -o errexit -o pipefail -o noclobber -o nounset set -eu -o errexit -o pipefail -o noclobber -o nounset
@ -19,7 +19,7 @@ fi
# option --output/-o requires 1 argument # option --output/-o requires 1 argument
LONGOPTS=console,debug,help,install:,logs:,restart,ssl,upgrade,webserver,version LONGOPTS=console,debug,help,install:,logs:,restart,ssl,upgrade,webserver,version
OPTIONS=cdhi:l:rsuwv 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 '') pg_pass=$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 15 ; echo '')
# if user does not specify an option # if user does not specify an option
@ -669,7 +669,9 @@ function get_logs() {
# None # None
############################################################################## ##############################################################################
function ssl() { function ssl() {
echo "Setting up ssl" if [ "$d" == "y" ]; then
echo "Setting up ssl"
fi
get_domain_info get_domain_info
if ! systemctl -q is-active nginx; then if ! systemctl -q is-active nginx; then
install_webserver install_webserver
@ -690,7 +692,7 @@ function ssl() {
function upgrade() { function upgrade() {
get_cw_version get_cw_version
echo "Upgrading Chatwoot to v$CW_VERSION" echo "Upgrading Chatwoot to v$CW_VERSION"
sleep 3
sudo -i -u chatwoot << "EOF" sudo -i -u chatwoot << "EOF"
# Navigate to the Chatwoot directory # Navigate to the Chatwoot directory
@ -757,7 +759,9 @@ function restart() {
# None # None
############################################################################## ##############################################################################
function webserver() { function webserver() {
echo "Installing nginx" if [ "$d" == "y" ]; then
echo "Installing nginx"
fi
ssl ssl
#TODO(@vn): allow installing nginx only without SSL #TODO(@vn): allow installing nginx only without SSL
} }