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

Fix for #50

Browse Source
This commit is contained in:
Alexander Trost
2016-03-09 11:16:24 +01:00
parent 07d13143ad
commit 1c505ef93a
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
entrypoint.sh
View File

@@ -291,21 +291,22 @@ zulipConfiguration() {
for setting_key in "${given_settings[@]}"; do for setting_key in "${given_settings[@]}"; do
local key="SETTING_$setting_key" local key="SETTING_$setting_key"
local setting_var="${!key}" local setting_var="${!key}"
local file="$ZPROJECT_SETTINGS"
if [ -z "$setting_var" ]; then if [ -z "$setting_var" ]; then
echo "Empty var for key \"$setting_key\"." echo "Empty var for key \"$setting_key\"."
continue continue
fi fi
# Zulip settings.py / zproject specific overrides here # Zulip settings.py / zproject specific overrides here
if [ "$setting_key" = "ADMIN_DOMAIN" ]; then if [ "$setting_key" = "ADMIN_DOMAIN" ]; then
local FILE="$SETTINGS_PY" file FILE="$SETTINGS_PY"
elif [ "$setting_key" = "MEMCACHED_LOCATION" ]; then elif [ "$setting_key" = "MEMCACHED_LOCATION" ]; then
FILE="$ZPROJECT_SETTINGS" file="$ZPROJECT_SETTINGS"
elif [[ "$setting_key" = "REDIS_"* ]]; then elif [[ "$setting_key" = "REDIS_"* ]]; then
FILE="$ZPROJECT_SETTINGS" file="$ZPROJECT_SETTINGS"
elif [[ "$setting_key" = "RABBITMQ_"* ]]; then elif [[ "$setting_key" = "RABBITMQ_"* ]]; then
FILE="$ZPROJECT_SETTINGS" file="$ZPROJECT_SETTINGS"
fi fi
setConfigurationValue "$setting_key" "$setting_var" "$FILE" setConfigurationValue "$setting_key" "$setting_var" "$file"
done done
unset setting_key setting_var KEY unset setting_key setting_var KEY
su zulip -c "/home/zulip/deployments/current/manage.py checkconfig" su zulip -c "/home/zulip/deployments/current/manage.py checkconfig"