paulmataruso/docker-zulip
1
0
Fork 0
mirror of https://github.com/zulip/docker-zulip.git synced 2025-11-04 14:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed some output messages to be a bit more meaningful

Browse Source
This commit is contained in:
Alexander Trost
2015-10-22 19:39:24 +02:00
parent 3818a5a3ee
commit f07669881e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
entrypoint.sh
View File

@@ -129,7 +129,7 @@ zulipSetup(){
esac esac
if [ ! -z "$ZULIP_AUTO_GENERATE_CERTS" ] && [ "$ZULIP_AUTO_GENERATE_CERTS" == "True" ]; then 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 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_SUBJ" ]; then
if [ -z "$ZULIP_CERTIFICATE_CN" ]; then if [ -z "$ZULIP_CERTIFICATE_CN" ]; then
if [ -z "$ZULIP_SETTINGS_EXTERNAL_HOST" ]; 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 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" 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 rm -f /tmp/server.csr /tmp/server.pass.key
echo "Certificates generation done." echo "Certificates autogenerated."
else else
echo "Certificates already exist. No need to generate them." echo "Certificates already exist. No need to generate them."
fi fi
@@ -319,7 +319,7 @@ EOF
waitingForDatabase() { waitingForDatabase() {
export PGPASSWORD="$DB_PASS" export PGPASSWORD="$DB_PASS"
local TIMEOUT=60 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 while ! /usr/bin/pg_isready -h "$DB_HOST" -p "$DB_HOST_PORT" -U "$DB_USER" -t 1 >/dev/null 2>&1
do do
TIMEOUT=$(expr $TIMEOUT - 1) TIMEOUT=$(expr $TIMEOUT - 1)