paulmataruso/docker-zulip
1
0
Fork 0
mirror of https://github.com/zulip/docker-zulip.git synced 2025-11-12 18:06:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added missing python "from zserver..." in db settings

Browse Source
This commit is contained in:
Alexander Trost
2015-10-08 16:48:12 +02:00
parent 85dbca035f
commit 643d44a976
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
entrypoint.sh
View File

@@ -13,6 +13,8 @@ ZULIP_SETTINGS="/etc/zulip/settings.py"
# I modified them to fit the "docker way" of installation ;) # I modified them to fit the "docker way" of installation ;)
function database-settings-setup(){ function database-settings-setup(){
cat <<EOF >> "$ZULIP_SETTINGS" cat <<EOF >> "$ZULIP_SETTINGS"
from zerver.lib.db import TimeTrackingConnection
DATABASES = {"default": { DATABASES = {"default": {
'ENGINE': 'django.db.backends.postgresql_psycopg2', 'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': '$DB_NAME', 'NAME': '$DB_NAME',
@@ -26,6 +28,7 @@ DATABASES = {"default": {
}, },
}, },
} }
EOF EOF
} }
function database-data-setup(){ function database-data-setup(){
@@ -57,7 +60,7 @@ function zulip-add-custom-secrets(){
KEY="ZULIP_SECRETS_$SECRET_KEY" KEY="ZULIP_SECRETS_$SECRET_KEY"
SECRET_VAR="${!KEY}" SECRET_VAR="${!KEY}"
if [ -z "$SECRET_VAR" ]; then if [ -z "$SECRET_VAR" ]; then
echo "No settings env var found for key \"$SECRET_KEY\". Continuing." echo "No settings env var for key \"$SECRET_KEY\". Continuing."
continue continue
fi fi
echo "Setting secret \"$SECRET_KEY\"." echo "Setting secret \"$SECRET_KEY\"."
@@ -84,6 +87,7 @@ CACHES = {
} }
}, },
} }
EOF EOF
# Rabbitmq settings # Rabbitmq settings
cat <<EOF >> "$ZULIP_SETTINGS" cat <<EOF >> "$ZULIP_SETTINGS"
@@ -95,15 +99,18 @@ EOF
RATE_LIMITING = $REDIS_RATE_LIMITING RATE_LIMITING = $REDIS_RATE_LIMITING
REDIS_HOST = '$REDIS_HOST' REDIS_HOST = '$REDIS_HOST'
REDIS_PORT = $REDIS_PORT REDIS_PORT = $REDIS_PORT
EOF EOF
# Camo settings # Camo settings
if [ ! -z "$CAMO_KEY" ]; then if [ ! -z "$CAMO_KEY" ]; then
cat <<EOF >> "$ZULIP_SETTINGS" cat <<EOF >> "$ZULIP_SETTINGS"
CAMO_KEY = '$CAMO_KEY' CAMO_KEY = '$CAMO_KEY'
EOF EOF
fi fi
cat <<EOF >> "$ZULIP_SETTINGS" cat <<EOF >> "$ZULIP_SETTINGS"
CAMO_URI = '$CAMO_URI' CAMO_URI = '$CAMO_URI'
EOF EOF
if [ ! -z "$ZULIP_CUSTOM_SETTINGS" ]; then if [ ! -z "$ZULIP_CUSTOM_SETTINGS" ]; then
echo -e "\n$ZULIP_CUSTOM_SETTINGS" >> "$ZULIP_SETTINGS" echo -e "\n$ZULIP_CUSTOM_SETTINGS" >> "$ZULIP_SETTINGS"
@@ -116,7 +123,7 @@ function zulip-setup-zulip-settings(){
KEY="ZULIP_SETTINGS_$SETTING_KEY" KEY="ZULIP_SETTINGS_$SETTING_KEY"
SETTING_VAR="${!KEY}" SETTING_VAR="${!KEY}"
if [ -z "$SETTING_VAR" ]; then if [ -z "$SETTING_VAR" ]; then
echo "No settings env var found for key \"$SETTING_KEY\". Continuing." echo "No settings env var for key \"$SETTING_KEY\". Continuing."
continue continue
fi fi
echo "Setting key \"$SETTING_KEY\" to value \"$SETTING_VAR\"." echo "Setting key \"$SETTING_KEY\" to value \"$SETTING_VAR\"."