From 1c505ef93af82cb40e9c0835eb6d6c0f50bfebab Mon Sep 17 00:00:00 2001 From: Alexander Trost Date: Wed, 9 Mar 2016 11:16:24 +0100 Subject: [PATCH] Fix for #50 --- entrypoint.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index f41618e..7f5831c 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -291,21 +291,22 @@ zulipConfiguration() { for setting_key in "${given_settings[@]}"; do local key="SETTING_$setting_key" local setting_var="${!key}" + local file="$ZPROJECT_SETTINGS" if [ -z "$setting_var" ]; then echo "Empty var for key \"$setting_key\"." continue fi # Zulip settings.py / zproject specific overrides here if [ "$setting_key" = "ADMIN_DOMAIN" ]; then - local FILE="$SETTINGS_PY" + file FILE="$SETTINGS_PY" elif [ "$setting_key" = "MEMCACHED_LOCATION" ]; then - FILE="$ZPROJECT_SETTINGS" + file="$ZPROJECT_SETTINGS" elif [[ "$setting_key" = "REDIS_"* ]]; then - FILE="$ZPROJECT_SETTINGS" + file="$ZPROJECT_SETTINGS" elif [[ "$setting_key" = "RABBITMQ_"* ]]; then - FILE="$ZPROJECT_SETTINGS" + file="$ZPROJECT_SETTINGS" fi - setConfigurationValue "$setting_key" "$setting_var" "$FILE" + setConfigurationValue "$setting_key" "$setting_var" "$file" done unset setting_key setting_var KEY su zulip -c "/home/zulip/deployments/current/manage.py checkconfig"