From f07669881eba8c37d554f20e746f7802618904e5 Mon Sep 17 00:00:00 2001 From: Alexander Trost Date: Thu, 22 Oct 2015 19:39:24 +0200 Subject: [PATCH] Changed some output messages to be a bit more meaningful --- entrypoint.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 311e419..6693ac0 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -129,7 +129,7 @@ zulipSetup(){ esac if [ ! -z "$ZULIP_AUTO_GENERATE_CERTS" ] && [ "$ZULIP_AUTO_GENERATE_CERTS" == "True" ]; then if [ ! -e "$DATA_DIR/certs/zulip.key" ] && [ ! -e "$DATA_DIR/certs/zulip.combined-chain.crt" ]; then - echo "Certificates generation is true. Generating certificates ..." + echo "ZULIP_AUTO_GENERATE_CERTS is true and no certs where found in $DATA_DIR/certs. Autogenerating certificates ..." if [ -z "$ZULIP_CERTIFICATE_SUBJ" ]; then if [ -z "$ZULIP_CERTIFICATE_CN" ]; then if [ -z "$ZULIP_SETTINGS_EXTERNAL_HOST" ]; then @@ -145,7 +145,7 @@ zulipSetup(){ openssl req -new -nodes -subj "$ZULIP_CERTIFICATE_SUBJ" -key "$DATA_DIR/certs/zulip.key" -out /tmp/server.csr openssl x509 -req -days 365 -in /tmp/server.csr -signkey "$DATA_DIR/certs/zulip.key" -out "$DATA_DIR/certs/zulip.combined-chain.crt" rm -f /tmp/server.csr /tmp/server.pass.key - echo "Certificates generation done." + echo "Certificates autogenerated." else echo "Certificates already exist. No need to generate them." fi @@ -319,7 +319,7 @@ EOF waitingForDatabase() { export PGPASSWORD="$DB_PASS" local TIMEOUT=60 - echo -n "Waiting for database server to allow connections" + echo "Waiting for database server to allow connections" while ! /usr/bin/pg_isready -h "$DB_HOST" -p "$DB_HOST_PORT" -U "$DB_USER" -t 1 >/dev/null 2>&1 do TIMEOUT=$(expr $TIMEOUT - 1)